/[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 623 by johnpye, Tue May 9 00:10:03 2006 UTC revision 624 by ben.allan, Thu May 18 15:39:38 2006 UTC
# Line 308  ac_includes_default="\ Line 308  ac_includes_default="\
308  # include <unistd.h>  # include <unistd.h>
309  #endif"  #endif"
310    
311  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 CPP DEBUG_LIBS EGREP YACC parser_src LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS TCLINCLUDE NOTCLCONFIG TCLCONFIG TCLLIB TCLDYNAMICLINKING TKINCLUDE TKLIB TKDYNAMICLINKING F77 BLASLIB LPAKLIB LSODLIB DEFAULT_ASCENDLIBRARY ASCEND_DEFAULTLIBRARY 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 TK_LIB TK_HDR TKTABLE_LIB 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'  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 CPP DEBUG_LIBS EGREP YACC parser_src LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS TCLINCLUDE NOTCLCONFIG TCLCONFIG TCLLIB TCLDYNAMICLINKING TKINCLUDE TKLIB TKDYNAMICLINKING F77 BLASLIB LPAKLIB LSODLIB QUIET_INSTALL DEFAULT_ASCENDLIBRARY ASCEND_DEFAULTLIBRARY 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 TK_LIB TK_HDR TKTABLE_LIB ASC_TK_LIBRARY ASC_TCL_LIBRARY ASC_DISTDIR_REL_BIN INSTALL_SHARE ASC_ENV_TK_DEFAULT TK_LD_HACK 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'
312  ac_subst_files=''  ac_subst_files=''
313    
314  # Initialize some variables set by options.  # Initialize some variables set by options.
# Line 898  Fortran compiler and libraries: Line 898  Fortran compiler and libraries:
898  Generation of Makefiles:  Generation of Makefiles:
899    --without-tkdir         do not generate Makefiles in the TK subdir    --without-tkdir         do not generate Makefiles in the TK subdir
900    --without-models        do not generate Makefiles in the models subdir    --without-models        do not generate Makefiles in the models subdir
901      --with-quiet        Much less whining if reinstalling the tk,models subdirs
902    
903  Some influential environment variables:  Some influential environment variables:
904    CC          C compiler command    CC          C compiler command
# Line 6134  fi Line 6135  fi
6135    
6136    
6137    
6138    TK_LD_HACK="\$(TK_LD_SEARCH_FLAGS)"
6139    if test "x$TK_LD_SEARCH_FLAGS" = "x''"; then
6140      TK_LD_HACK=""
6141    fi
6142    if test "x$TK_LD_SEARCH_FLAGS" = "x"; then
6143      TK_LD_HACK=""
6144    fi
6145    
6146    
6147  #--------------------------------------------------------------------  #--------------------------------------------------------------------
# Line 8179  if test ! "X$with_models" = "Xno" ; then Line 8187  if test ! "X$with_models" = "Xno" ; then
8187  fi  fi
8188    
8189    
8190    # Check whether --with-quiet or --without-quiet was given.
8191    if test "${with_quiet+set}" = set; then
8192      withval="$with_quiet"
8193    
8194    else
8195      with_quiet=no
8196    fi;
8197    if test ! "X$with_quiet" = "Xno" ; then
8198        QUIET_INSTALL=1
8199    else
8200        QUIET_INSTALL=0
8201    fi
8202    
8203    
8204  # Initialize variables  # Initialize variables
8205  help_dir_root=''  help_dir_root=''
8206  help_topbuilddir=''  help_topbuilddir=''
# Line 8291  else Line 8313  else
8313  echo "${ECHO_T}no" >&6  echo "${ECHO_T}no" >&6
8314  fi  fi
8315    
8316  DEFAULT_ASCENDLIBRARY=$prefix/models  ASC_DISTDIR_REL_BIN=".."
8317  ASCEND_DEFAULTLIBRARY=$prefix/models  # Next we determine whether models and TK get installed in
8318    # prefix or datadir. If datadir not explicitly given, we
8319    # use prefix.
8320    if test "x$datadir" = 'x${prefix}/share'; then
8321      INSTALL_SHARE="$prefix"
8322    else
8323      INSTALL_SHARE="$datadir"
8324    fi
8325    DEFAULT_ASCENDLIBRARY="$INSTALL_SHARE/models"
8326    ASCEND_DEFAULTLIBRARY="$INSTALL_SHARE/models"
8327    ASC_ENV_TK_DEFAULT="$INSTALL_SHARE/TK"
8328    
8329    
8330  #--------------------------------------------------------------------  #--------------------------------------------------------------------
8331  #   The variables we substitute into the Makefile.in files  #   The variables we substitute into the Makefile.in files
# Line 8340  ASCEND_DEFAULTLIBRARY=$prefix/models Line 8373  ASCEND_DEFAULTLIBRARY=$prefix/models
8373    
8374    
8375    
8376    
8377    
8378    
8379    
8380  #AWW20041113: AC_SUBST(OPTSQPLIB)  #AWW20041113: AC_SUBST(OPTSQPLIB)
8381  #AWW20041113: AC_SUBST(make_rsqplib)  #AWW20041113: AC_SUBST(make_rsqplib)
8382  #AWW20041113: AC_SUBST(HAVE_OPTSQP)  #AWW20041113: AC_SUBST(HAVE_OPTSQP)
# Line 9005  s,@F77@,$F77,;t t Line 9042  s,@F77@,$F77,;t t
9042  s,@BLASLIB@,$BLASLIB,;t t  s,@BLASLIB@,$BLASLIB,;t t
9043  s,@LPAKLIB@,$LPAKLIB,;t t  s,@LPAKLIB@,$LPAKLIB,;t t
9044  s,@LSODLIB@,$LSODLIB,;t t  s,@LSODLIB@,$LSODLIB,;t t
9045    s,@QUIET_INSTALL@,$QUIET_INSTALL,;t t
9046  s,@DEFAULT_ASCENDLIBRARY@,$DEFAULT_ASCENDLIBRARY,;t t  s,@DEFAULT_ASCENDLIBRARY@,$DEFAULT_ASCENDLIBRARY,;t t
9047  s,@ASCEND_DEFAULTLIBRARY@,$ASCEND_DEFAULTLIBRARY,;t t  s,@ASCEND_DEFAULTLIBRARY@,$ASCEND_DEFAULTLIBRARY,;t t
9048  s,@ascpwd@,$ascpwd,;t t  s,@ascpwd@,$ascpwd,;t t
# Line 9030  s,@TK_HDR@,$TK_HDR,;t t Line 9068  s,@TK_HDR@,$TK_HDR,;t t
9068  s,@TKTABLE_LIB@,$TKTABLE_LIB,;t t  s,@TKTABLE_LIB@,$TKTABLE_LIB,;t t
9069  s,@ASC_TK_LIBRARY@,$ASC_TK_LIBRARY,;t t  s,@ASC_TK_LIBRARY@,$ASC_TK_LIBRARY,;t t
9070  s,@ASC_TCL_LIBRARY@,$ASC_TCL_LIBRARY,;t t  s,@ASC_TCL_LIBRARY@,$ASC_TCL_LIBRARY,;t t
9071    s,@ASC_DISTDIR_REL_BIN@,$ASC_DISTDIR_REL_BIN,;t t
9072    s,@INSTALL_SHARE@,$INSTALL_SHARE,;t t
9073    s,@ASC_ENV_TK_DEFAULT@,$ASC_ENV_TK_DEFAULT,;t t
9074    s,@TK_LD_HACK@,$TK_LD_HACK,;t t
9075  s,@HAVE_TKTABLE@,$HAVE_TKTABLE,;t t  s,@HAVE_TKTABLE@,$HAVE_TKTABLE,;t t
9076  s,@asc_subdirs@,$asc_subdirs,;t t  s,@asc_subdirs@,$asc_subdirs,;t t
9077  s,@F77LIBS@,$F77LIBS,;t t  s,@F77LIBS@,$F77LIBS,;t t

Legend:
Removed from v.623  
changed lines
  Added in v.624

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22