Changeset 1385


Ignore:
Timestamp:
07/27/09 14:15:58 (15 years ago)
Author:
seroussi
Message:

end of mac configs

Location:
issm/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/Makefile.in

    r1378 r1385  
    104104FLIBS = @FLIBS@
    105105FORTRANLIB = @FORTRANLIB@
     106GRAPHICSLIB = @GRAPHICSLIB@
    106107INSTALL = @INSTALL@
    107108INSTALL_DATA = @INSTALL_DATA@

  • issm/trunk/autom4te.cache/output.0

    r1378 r1385  
    723723MATHLIB
    724724FORTRANLIB
     725GRAPHICSLIB
    725726LIB@&t@OBJS
    726727LTLIBOBJS'
    … …  
    13601361  --with-fortran-lib = options
    13611362                          fortran options, for ex: "/usr/lib/gfortran.a
     1363  --with-graphics-lib = options
     1364                          graphics options, for ex: "/usr/X11/lib/libX11.a
    13621365
    13631366Some influential environment variables:
    … …  
    71517154cat >>confdefs.h <<\_ACEOF
    71527155@%:@define _HAVE_FORTRAN_ 1
     7156_ACEOF
     7157
     7158               
     7159        fi
     7160        { echo "$as_me:$LINENO: result: done" >&5
     7161echo "${ECHO_T}done" >&6; }
     7162
     7163                { echo "$as_me:$LINENO: checking for graphics library..." >&5
     7164echo $ECHO_N "checking for graphics library...... $ECHO_C" >&6; }
     7165       
     7166# Check whether --with-graphics-lib was given.
     7167if test "${with_graphics_lib+set}" = set; then
     7168  withval=$with_graphics_lib; GRAPHICS_LIB=$withval
     7169else
     7170  GRAPHICS_LIB=""
     7171fi
     7172
     7173
     7174                if test -n "$GRAPHICS_LIB" ; then
     7175                HAVE_GRAPHICS=yes
     7176                GRAPHICSLIB="$GRAPHICS_LIB"
     7177
     7178               
     7179cat >>confdefs.h <<\_ACEOF
     7180@%:@define _HAVE_GRAPHICS_ 1
    71537181_ACEOF
    71547182
    … …  
    80208048MATHLIB!$MATHLIB$ac_delim
    80218049FORTRANLIB!$FORTRANLIB$ac_delim
     8050GRAPHICSLIB!$GRAPHICSLIB$ac_delim
    80228051LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim
    80238052LTLIBOBJS!$LTLIBOBJS$ac_delim
    80248053_ACEOF
    80258054
    8026   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
     8055  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
    80278056    break
    80288057  elif $ac_last_try; then

  • issm/trunk/autom4te.cache/output.1

    r1378 r1385  
    723723MATHLIB
    724724FORTRANLIB
     725GRAPHICSLIB
    725726LIB@&t@OBJS
    726727LTLIBOBJS'
    … …  
    13601361  --with-fortran-lib = options
    13611362                          fortran options, for ex: "/usr/lib/gfortran.a
     1363  --with-graphics-lib = options
     1364                          graphics options, for ex: "/usr/X11/lib/libX11.a
    13621365
    13631366Some influential environment variables:
    … …  
    71517154cat >>confdefs.h <<\_ACEOF
    71527155@%:@define _HAVE_FORTRAN_ 1
     7156_ACEOF
     7157
     7158               
     7159        fi
     7160        { echo "$as_me:$LINENO: result: done" >&5
     7161echo "${ECHO_T}done" >&6; }
     7162
     7163                { echo "$as_me:$LINENO: checking for graphics library..." >&5
     7164echo $ECHO_N "checking for graphics library...... $ECHO_C" >&6; }
     7165       
     7166# Check whether --with-graphics-lib was given.
     7167if test "${with_graphics_lib+set}" = set; then
     7168  withval=$with_graphics_lib; GRAPHICS_LIB=$withval
     7169else
     7170  GRAPHICS_LIB=""
     7171fi
     7172
     7173
     7174                if test -n "$GRAPHICS_LIB" ; then
     7175                HAVE_GRAPHICS=yes
     7176                GRAPHICSLIB="$GRAPHICS_LIB"
     7177
     7178               
     7179cat >>confdefs.h <<\_ACEOF
     7180@%:@define _HAVE_GRAPHICS_ 1
    71537181_ACEOF
    71547182
    … …  
    80208048MATHLIB!$MATHLIB$ac_delim
    80218049FORTRANLIB!$FORTRANLIB$ac_delim
     8050GRAPHICSLIB!$GRAPHICSLIB$ac_delim
    80228051LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim
    80238052LTLIBOBJS!$LTLIBOBJS$ac_delim
    80248053_ACEOF
    80258054
    8026   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
     8055  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then
    80278056    break
    80288057  elif $ac_last_try; then

  • issm/trunk/autom4te.cache/traces.0

    r1378 r1385  
    512512AC_SUBST([am__untar])
    513513])
    514 m4trace:m4/issm_options.m4:474: -1- AC_DEFUN([ISSM_OPTIONS], [
     514m4trace:m4/issm_options.m4:491: -1- AC_DEFUN([ISSM_OPTIONS], [
    515515        dnl Debugging option check.
    516516        AC_ARG_ENABLE([debugging],AS_HELP_STRING([--enable-debugging],
    … …  
    980980                AC_DEFINE([_HAVE_FORTRAN_],[1],[with FORTRAN in ISSM src])
    981981                AC_SUBST([FORTRANLIB])
     982        fi
     983        AC_MSG_RESULT(done)
     984
     985        dnl graphics library  option
     986        AC_MSG_CHECKING(for graphics library...)
     987        AC_ARG_WITH([graphics-lib],
     988                          AS_HELP_STRING([--with-graphics-lib = options],
     989                                                         [graphics options, for ex: "/usr/X11/lib/libX11.a]),
     990                          [GRAPHICS_LIB=$withval],[GRAPHICS_LIB=""])
     991
     992        dnl check that --with-graphics-lib may have been provided
     993        if test -n "$GRAPHICS_LIB" ; then
     994                HAVE_GRAPHICS=yes
     995                GRAPHICSLIB="$GRAPHICS_LIB"
     996
     997                AC_DEFINE([_HAVE_GRAPHICS_],[1],[with GRAPHICS in ISSM src])
     998                AC_SUBST([GRAPHICSLIB])
    982999        fi
    9831000        AC_MSG_RESULT(done)
    … …  
    19121929m4/matlab.m4:469: AX_MATLAB is expanded from...
    19131930m4/matlab.m4:323: AX_MATLAB_VERSION is expanded from...
    1914 m4/issm_options.m4:474: ISSM_OPTIONS is expanded from...
     1931m4/issm_options.m4:491: ISSM_OPTIONS is expanded from...
    19151932configure.ac:12: the top level])
    19161933m4trace:configure.ac:12: -1- m4_pattern_allow([^HAVE_MATLAB$])
    … …  
    19661983m4trace:configure.ac:12: -1- m4_pattern_allow([^_HAVE_FORTRAN_$])
    19671984m4trace:configure.ac:12: -1- m4_pattern_allow([^FORTRANLIB$])
     1985m4trace:configure.ac:12: -1- m4_pattern_allow([^_HAVE_GRAPHICS_$])
     1986m4trace:configure.ac:12: -1- m4_pattern_allow([^GRAPHICSLIB$])
    19681987m4trace:configure.ac:18: -1- m4_pattern_allow([^LIB@&t@OBJS$])
    19691988m4trace:configure.ac:18: -1- m4_pattern_allow([^LTLIBOBJS$])

  • issm/trunk/autom4te.cache/traces.1

    r1378 r1385  
    483483m4/matlab.m4:469: AX_MATLAB is expanded from...
    484484m4/matlab.m4:323: AX_MATLAB_VERSION is expanded from...
    485 m4/issm_options.m4:474: ISSM_OPTIONS is expanded from...
     485m4/issm_options.m4:491: ISSM_OPTIONS is expanded from...
    486486configure.ac:12: the top level])
    487487m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([HAVE_MATLAB])
    … …  
    653653m4trace:configure.ac:12: -1- AC_SUBST_TRACE([FORTRANLIB])
    654654m4trace:configure.ac:12: -1- m4_pattern_allow([^FORTRANLIB$])
     655m4trace:configure.ac:12: -1- AC_DEFINE_TRACE_LITERAL([_HAVE_GRAPHICS_])
     656m4trace:configure.ac:12: -1- m4_pattern_allow([^_HAVE_GRAPHICS_$])
     657m4trace:configure.ac:12: -1- AH_OUTPUT([_HAVE_GRAPHICS_], [/* with GRAPHICS in ISSM src */
     658#undef _HAVE_GRAPHICS_])
     659m4trace:configure.ac:12: -1- AC_SUBST([GRAPHICSLIB])
     660m4trace:configure.ac:12: -1- AC_SUBST_TRACE([GRAPHICSLIB])
     661m4trace:configure.ac:12: -1- m4_pattern_allow([^GRAPHICSLIB$])
    655662m4trace:configure.ac:17: -1- AC_CONFIG_FILES([Makefile
    656663                        src/Makefile

  • issm/trunk/bin/Makefile.in

    r1378 r1385  
    7777FLIBS = @FLIBS@
    7878FORTRANLIB = @FORTRANLIB@
     79GRAPHICSLIB = @GRAPHICSLIB@
    7980INSTALL = @INSTALL@
    8081INSTALL_DATA = @INSTALL_DATA@

  • issm/trunk/config.h.in

    r1378 r1385  
    5555#undef _HAVE_FORTRAN_
    5656
     57/* with GRAPHICS in ISSM src */
     58#undef _HAVE_GRAPHICS_
     59
    5760/* with MATH in ISSM src */
    5861#undef _HAVE_MATH_
Note: See TracChangeset for help on using the changeset viewer.