/[ascend]/trunk/base/autotools/configure
ViewVC logotype

Diff of /trunk/base/autotools/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 191 by johnpye, Thu Dec 22 02:16:37 2005 UTC revision 192 by johnpye, Mon Jan 16 14:54:35 2006 UTC
# Line 309  ac_includes_default="\ Line 309  ac_includes_default="\
309  # include <unistd.h>  # include <unistd.h>
310  #endif"  #endif"
311    
312  ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RANLIB ac_ct_RANLIB LN_S SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT asc_cc1 asc_cc2 asc_cc3 CPP DEBUG_LIBS EGREP YACC LEX LEXLIB LEX_OUTPUT_ROOT TCL_LIB TCL_HDR TK_LIB TK_HDR TKTABLE_LIB F77 BLASLIB LPAKLIB LSODLIB ascpwd fullpathsrcdir asc_include scanner_src typer_src MATH_LIBS X11_INCLUDES X11_LIBRARIES X11_RUN_PATH X11_EXTRA_LIBS DL_LIBS LD_FLAGS LD_SEARCH_FLAGS SHLIB_CFLAGS SHLIB_LD SHLIB_LD_LIBS SHLIB_SUFFIX ASC_LIB_SUFFIX ASC_TK_LIBRARY ASC_TCL_LIBRARY HAVE_TKTABLE asc_subdirs F77LIBS make_blaslib make_lpaklib make_lsodlib HAVE_LSOD tkdir_root tkdir_topbuilddir models_dir_root models_topbuilddir help_dir_root help_topbuilddir LIBOBJS LTLIBOBJS'  ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS RANLIB ac_ct_RANLIB LN_S SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT asc_cc1 asc_cc2 asc_cc3 CPP DEBUG_LIBS EGREP YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS TCL_LIB TCL_HDR TK_LIB TK_HDR TKTABLE_LIB F77 BLASLIB LPAKLIB LSODLIB ascpwd fullpathsrcdir asc_include scanner_src typer_src MATH_LIBS X11_INCLUDES X11_LIBRARIES X11_RUN_PATH X11_EXTRA_LIBS DL_LIBS LD_FLAGS LD_SEARCH_FLAGS SHLIB_CFLAGS SHLIB_LD SHLIB_LD_LIBS SHLIB_SUFFIX ASC_LIB_SUFFIX ASC_TK_LIBRARY ASC_TCL_LIBRARY HAVE_TKTABLE asc_subdirs F77LIBS make_blaslib make_lpaklib make_lsodlib HAVE_LSOD tkdir_root tkdir_topbuilddir models_dir_root models_topbuilddir help_dir_root help_topbuilddir LTLIBOBJS'
313  ac_subst_files=''  ac_subst_files=''
314    
315  # Initialize some variables set by options.  # Initialize some variables set by options.
# Line 1480  case "$srcdir" in Line 1480  case "$srcdir" in
1480          asc_include="../$srcdir"          asc_include="../$srcdir"
1481          ;;          ;;
1482      /*)      /*)
 #AWW20041113:        asc_include="$srcdir/ascend4"  
1483          asc_include="$srcdir/../generic"          asc_include="$srcdir/../generic"
1484          ;;          ;;
1485      *)      *)
 #AWW20041113:        asc_include="../../$srcdir/ascend4"  
1486          asc_include="$srcdir/../generic"          asc_include="$srcdir/../generic"
1487          ;;          ;;
1488  esac  esac
# Line 1700  test -z "$INSTALL_SCRIPT" && INSTALL_SCR Line 1698  test -z "$INSTALL_SCRIPT" && INSTALL_SCR
1698    
1699  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1700    
1701  ##AWW20041113:   No fixing seems necessary.  
1702  case "X$INSTALL" in  case "X$INSTALL" in
1703      X/*)      X/*)
1704          ;;          ;;
# Line 5746  done Line 5744  done
5744    
5745  LIBS="$asc_keep_LIBS"  LIBS="$asc_keep_LIBS"
5746    
5747    #----------------------------------------------
5748    # Check for 'vsnprintf' -- there seems to be a problem with in
5749    # on cygwin.
5750    
5751    
5752    
5753    
5754    
5755    
5756    for ac_func in snprintf vsnprintf
5757    do
5758    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
5759    echo "$as_me:$LINENO: checking for $ac_func" >&5
5760    echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
5761    if eval "test \"\${$as_ac_var+set}\" = set"; then
5762      echo $ECHO_N "(cached) $ECHO_C" >&6
5763    else
5764      cat >conftest.$ac_ext <<_ACEOF
5765    /* confdefs.h.  */
5766    _ACEOF
5767    cat confdefs.h >>conftest.$ac_ext
5768    cat >>conftest.$ac_ext <<_ACEOF
5769    /* end confdefs.h.  */
5770    /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
5771       For example, HP-UX 11i <limits.h> declares gettimeofday.  */
5772    #define $ac_func innocuous_$ac_func
5773    
5774    /* System header to define __stub macros and hopefully few prototypes,
5775        which can conflict with char $ac_func (); below.
5776        Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
5777        <limits.h> exists even on freestanding compilers.  */
5778    
5779    #ifdef __STDC__
5780    # include <limits.h>
5781    #else
5782    # include <assert.h>
5783    #endif
5784    
5785    #undef $ac_func
5786    
5787    /* Override any gcc2 internal prototype to avoid an error.  */
5788    #ifdef __cplusplus
5789    extern "C"
5790    {
5791    #endif
5792    /* We use char because int might match the return type of a gcc2
5793       builtin and then its argument prototype would still apply.  */
5794    char $ac_func ();
5795    /* The GNU C library defines this for functions which it implements
5796        to always fail with ENOSYS.  Some functions are actually named
5797        something starting with __ and the normal name is an alias.  */
5798    #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
5799    choke me
5800    #else
5801    char (*f) () = $ac_func;
5802    #endif
5803    #ifdef __cplusplus
5804    }
5805    #endif
5806    
5807    int
5808    main ()
5809    {
5810    return f != $ac_func;
5811      ;
5812      return 0;
5813    }
5814    _ACEOF
5815    rm -f conftest.$ac_objext conftest$ac_exeext
5816    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5817      (eval $ac_link) 2>conftest.er1
5818      ac_status=$?
5819      grep -v '^ *+' conftest.er1 >conftest.err
5820      rm -f conftest.er1
5821      cat conftest.err >&5
5822      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5823      (exit $ac_status); } &&
5824         { ac_try='test -z "$ac_c_werror_flag"
5825                 || test ! -s conftest.err'
5826      { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5827      (eval $ac_try) 2>&5
5828      ac_status=$?
5829      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5830      (exit $ac_status); }; } &&
5831         { ac_try='test -s conftest$ac_exeext'
5832      { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5833      (eval $ac_try) 2>&5
5834      ac_status=$?
5835      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5836      (exit $ac_status); }; }; then
5837      eval "$as_ac_var=yes"
5838    else
5839      echo "$as_me: failed program was:" >&5
5840    sed 's/^/| /' conftest.$ac_ext >&5
5841    
5842    eval "$as_ac_var=no"
5843    fi
5844    rm -f conftest.err conftest.$ac_objext \
5845          conftest$ac_exeext conftest.$ac_ext
5846    fi
5847    echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
5848    echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
5849    if test `eval echo '${'$as_ac_var'}'` = yes; then
5850      cat >>confdefs.h <<_ACEOF
5851    #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
5852    _ACEOF
5853    
5854    fi
5855    done
5856    
5857    echo "$as_me:$LINENO: checking for working snprintf" >&5
5858    echo $ECHO_N "checking for working snprintf... $ECHO_C" >&6
5859    if test "${ac_cv_have_working_snprintf+set}" = set; then
5860      echo $ECHO_N "(cached) $ECHO_C" >&6
5861    else
5862      if test "$cross_compiling" = yes; then
5863      ac_cv_have_working_snprintf=cross
5864    else
5865      cat >conftest.$ac_ext <<_ACEOF
5866    /* confdefs.h.  */
5867    _ACEOF
5868    cat confdefs.h >>conftest.$ac_ext
5869    cat >>conftest.$ac_ext <<_ACEOF
5870    /* end confdefs.h.  */
5871    #include <stdio.h>
5872    
5873    int main(void)
5874    {
5875        char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
5876        char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
5877        int i;
5878        i = snprintf (bufs, 2, "%s", "111");
5879        if (strcmp (bufs, "1")) exit (1);
5880        if (i != 3) exit (1);
5881        i = snprintf (bufd, 2, "%d", 111);
5882        if (strcmp (bufd, "1")) exit (1);
5883        if (i != 3) exit (1);
5884        exit(0);
5885    }
5886    _ACEOF
5887    rm -f conftest$ac_exeext
5888    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5889      (eval $ac_link) 2>&5
5890      ac_status=$?
5891      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5892      (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5893      { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5894      (eval $ac_try) 2>&5
5895      ac_status=$?
5896      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5897      (exit $ac_status); }; }; then
5898      ac_cv_have_working_snprintf=yes
5899    else
5900      echo "$as_me: program exited with status $ac_status" >&5
5901    echo "$as_me: failed program was:" >&5
5902    sed 's/^/| /' conftest.$ac_ext >&5
5903    
5904    ( exit $ac_status )
5905    ac_cv_have_working_snprintf=no
5906    fi
5907    rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5908    fi
5909    fi
5910    
5911    echo "$as_me:$LINENO: result: $ac_cv_have_working_snprintf" >&5
5912    echo "${ECHO_T}$ac_cv_have_working_snprintf" >&6
5913    echo "$as_me:$LINENO: checking for working vsnprintf" >&5
5914    echo $ECHO_N "checking for working vsnprintf... $ECHO_C" >&6
5915    if test "${ac_cv_have_working_vsnprintf+set}" = set; then
5916      echo $ECHO_N "(cached) $ECHO_C" >&6
5917    else
5918      if test "$cross_compiling" = yes; then
5919      ac_cv_have_working_vsnprintf=cross
5920    else
5921      cat >conftest.$ac_ext <<_ACEOF
5922    /* confdefs.h.  */
5923    _ACEOF
5924    cat confdefs.h >>conftest.$ac_ext
5925    cat >>conftest.$ac_ext <<_ACEOF
5926    /* end confdefs.h.  */
5927    #include <stdio.h>
5928    #include <stdarg.h>
5929    
5930    int my_vsnprintf (char *buf, const char *tmpl, ...)
5931    {
5932        int i;
5933        va_list args;
5934        va_start (args, tmpl);
5935        i = vsnprintf (buf, 2, tmpl, args);
5936        va_end (args);
5937        return i;
5938    }
5939    
5940    int main(void)
5941    {
5942        char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
5943        char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
5944        int i;
5945        i = my_vsnprintf (bufs, "%s", "111");
5946        if (strcmp (bufs, "1")) exit (1);
5947        if (i != 3) exit (1);
5948        i = my_vsnprintf (bufd, "%d", 111);
5949        if (strcmp (bufd, "1")) exit (1);
5950        if (i != 3) exit (1);
5951        exit(0);
5952    }
5953    _ACEOF
5954    rm -f conftest$ac_exeext
5955    if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5956      (eval $ac_link) 2>&5
5957      ac_status=$?
5958      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5959      (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
5960      { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5961      (eval $ac_try) 2>&5
5962      ac_status=$?
5963      echo "$as_me:$LINENO: \$? = $ac_status" >&5
5964      (exit $ac_status); }; }; then
5965      ac_cv_have_working_vsnprintf=yes
5966    else
5967      echo "$as_me: program exited with status $ac_status" >&5
5968    echo "$as_me: failed program was:" >&5
5969    sed 's/^/| /' conftest.$ac_ext >&5
5970    
5971    ( exit $ac_status )
5972    ac_cv_have_working_vsnprintf=no
5973    fi
5974    rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
5975    fi
5976    fi
5977    
5978    echo "$as_me:$LINENO: result: $ac_cv_have_working_vsnprintf" >&5
5979    echo "${ECHO_T}$ac_cv_have_working_vsnprintf" >&6
5980    if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
5981      case $LIBOBJS in
5982        "snprintf.$ac_objext"   | \
5983      *" snprintf.$ac_objext"   | \
5984        "snprintf.$ac_objext "* | \
5985      *" snprintf.$ac_objext "* ) ;;
5986      *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" ;;
5987    esac
5988    
5989      { echo "$as_me:$LINENO: WARNING: Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/." >&5
5990    echo "$as_me: WARNING: Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/." >&2;}
5991    
5992    cat >>confdefs.h <<\_ACEOF
5993    #define PREFER_PORTABLE_SNPRINTF 1
5994    _ACEOF
5995    
5996    fi
5997    
5998  #--------------------------------------------------------------------  #--------------------------------------------------------------------
5999  #   Check for X11.  #   Check for X11.
# Line 11897  s,@YACC@,$YACC,;t t Line 12145  s,@YACC@,$YACC,;t t
12145  s,@LEX@,$LEX,;t t  s,@LEX@,$LEX,;t t
12146  s,@LEXLIB@,$LEXLIB,;t t  s,@LEXLIB@,$LEXLIB,;t t
12147  s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t  s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
12148    s,@LIBOBJS@,$LIBOBJS,;t t
12149  s,@TCL_LIB@,$TCL_LIB,;t t  s,@TCL_LIB@,$TCL_LIB,;t t
12150  s,@TCL_HDR@,$TCL_HDR,;t t  s,@TCL_HDR@,$TCL_HDR,;t t
12151  s,@TK_LIB@,$TK_LIB,;t t  s,@TK_LIB@,$TK_LIB,;t t
# Line 11939  s,@models_dir_root@,$models_dir_root,;t Line 12188  s,@models_dir_root@,$models_dir_root,;t
12188  s,@models_topbuilddir@,$models_topbuilddir,;t t  s,@models_topbuilddir@,$models_topbuilddir,;t t
12189  s,@help_dir_root@,$help_dir_root,;t t  s,@help_dir_root@,$help_dir_root,;t t
12190  s,@help_topbuilddir@,$help_topbuilddir,;t t  s,@help_topbuilddir@,$help_topbuilddir,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t  
12191  s,@LTLIBOBJS@,$LTLIBOBJS,;t t  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
12192  CEOF  CEOF
12193    
Legend:
Removed from v.191  
changed lines
  Added in v.192
john.pye@anu.edu.au
 ViewVC Help
Powered by ViewVC 1.1.22