/[ascend]/trunk/configure.in
ViewVC logotype

Diff of /trunk/configure.in

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

revision 1 by aw0a, Fri Oct 29 20:54:12 2004 UTC revision 7 by ben.allan, Thu Nov 11 20:32:47 2004 UTC
# Line 1034  esac Line 1034  esac
1034  #  try to find a static version of the Tcl8.0 library  #  try to find a static version of the Tcl8.0 library
1035  #  #
1036  if test "X$with_tcllib" = X_searching ; then  if test "X$with_tcllib" = X_searching ; then
1037      AC_PATH_PROGS(TCL_LIB, libtcl8.0.a libtcl80.a, , $asc_tcl_library_dirs)      AC_PATH_PROGS(TCL_LIB, libtcl8.0.a libtcl80.a libtcl8.3.a, , $asc_tcl_library_dirs)
1038      if test -z "$TCL_LIB" ; then      if test -z "$TCL_LIB" ; then
1039          TCL_LIB=_searching          TCL_LIB=_searching
1040      fi      fi
# Line 1044  fi Line 1044  fi
1044    
1045  #  verify the TCL_LIB  #  verify the TCL_LIB
1046  if test ! "X$TCL_LIB" = X_searching ; then  if test ! "X$TCL_LIB" = X_searching ; then
1047      AC_MSG_CHECKING([whether $TCL_LIB is for Tcl8.0])      AC_MSG_CHECKING([whether $TCL_LIB is for Tcl8.3])
1048      asc_libs_orig=$LIBS      asc_libs_orig=$LIBS
1049      LIBS="$TCL_LIB $X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS $LIBS"      LIBS="$TCL_LIB $X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS $LIBS"
1050      AC_TRY_LINK( , [TclCompileCatchCmd()], , [TCL_LIB=_searching]);      AC_TRY_LINK( , [TclCompileCatchCmd()], , [TCL_LIB=_searching]);
# Line 1059  fi Line 1059  fi
1059  #  see if the default LPATH can find the Tcl8.0 library  #  see if the default LPATH can find the Tcl8.0 library
1060  #  #
1061  if test "X$TCL_LIB" = X_searching ; then  if test "X$TCL_LIB" = X_searching ; then
1062        AC_CHECK_LIB(tcl83, TclCompileCatchCmd, [TCL_LIB="-ltcl83"] , ,
1063        [$X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS])
1064    fi
1065    if test "X$TCL_LIB" = X_searching ; then
1066        AC_CHECK_LIB(tcl8.3, TclCompileCatchCmd, [TCL_LIB="-ltcl8.3"] , ,
1067        [$X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS])
1068    fi
1069    if test "X$TCL_LIB" = X_searching ; then
1070      AC_CHECK_LIB(tcl8.0, TclCompileCatchCmd, [TCL_LIB="-ltcl8.0"] , ,      AC_CHECK_LIB(tcl8.0, TclCompileCatchCmd, [TCL_LIB="-ltcl8.0"] , ,
1071      [$X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS])      [$X11_LIBRARIES $X11_EXTRA_LIBS $DL_LIBS $MATH_LIBS])
1072  fi  fi
# Line 1075  fi Line 1083  fi
1083  #  #
1084  if test "X$TCL_LIB" = X_searching ; then  if test "X$TCL_LIB" = X_searching ; then
1085      AC_MSG_ERROR([Cannot find a compatiable Tcl library.      AC_MSG_ERROR([Cannot find a compatiable Tcl library.
1086      You must build and install Tcl version 8.0 or newer before you      You must build and install Tcl version 8.3  before you
1087      can build ASCEND.  If you have installed the correct version      can build ASCEND.  If you have installed the correct version
1088      of Tcl, run configure again with the argument:      of Tcl, run configure again with the argument:
1089          --with-tcl=LIBRARY,HEADER          --with-tcl=LIBRARY,HEADER
1090      where LIBRARY and HEADER are the full paths to the Tcl8.0      where LIBRARY and HEADER are the full paths to the Tcl8.3
1091      library file and header file, respectively.])      library file and header file, respectively.])
1092  fi  fi
1093    
# Line 1117  if test -f "$TCL_HDR" ; then Line 1125  if test -f "$TCL_HDR" ; then
1125  fi  fi
1126  if test -z "$TCL_HDR" ; then  if test -z "$TCL_HDR" ; then
1127      AC_MSG_ERROR([Cannot find a compatiable Tcl header file.      AC_MSG_ERROR([Cannot find a compatiable Tcl header file.
1128      You must build and install Tcl version 8.0 or newer before you      You must build and install Tcl version 8.3 (but not yet 8.4) before you
1129      can build ASCEND.  If you have installed the correct version      can build ASCEND.  If you have installed the correct version
1130      of Tcl, run configure again with the argument:      of Tcl, run configure again with the argument:
1131          --with-tcl=LIBRARY,HEADER          --with-tcl=LIBRARY,HEADER
1132      where LIBRARY and HEADER are the full paths to the Tcl8.0      where LIBRARY and HEADER are the full paths to the Tcl8.3
1133      library file and header file, respectively.])      library file and header file, respectively.])
1134  fi  fi
1135  TCL_HDR=`echo $TCL_HDR | sed 's,tcl\.h$,,'`  TCL_HDR=`echo $TCL_HDR | sed 's,tcl\.h$,,'`
# Line 1132  fi Line 1140  fi
1140    
1141  ######  REPEAT FOR TK  ######  REPEAT FOR TK
1142  #  #
1143  #  see if the user gave us the location of the Tk8.0  #  see if the user gave us the location of the Tk8.3
1144  #  library and/or header file  #  library and/or header file
1145  #  #
1146  AC_ARG_WITH(tk,  AC_ARG_WITH(tk,
1147      [  --with-tk=LIBRARY,HEADER      [  --with-tk=LIBRARY,HEADER
1148                            The location of the Tk8.0 library and/or header                            The location of the Tk8.0 library and/or header
1149                            For a static Tk8.0 library, give the full path:                            For a static Tk8.0 library, give the full path:
1150                                --with-tk='/usr/local/lib/libtk8.0.a'                                --with-tk='/usr/local/lib/libtk8.3.a'
1151                            For a dynamic library, give any -L options required:                            For a dynamic library, give any -L options required:
1152                                --with-tk='-L/usr/local/lib -ltk8.0'                                --with-tk='-L/usr/local/lib -ltk8.3'
1153                            To specify only the header, leave off the library:                            To specify only the header, leave off the library:
1154                                --with-tk=',/usr/local/include/tk.h'] ,                                --with-tk=',/usr/local/include/tk.h'] ,
1155      , [with_tk=yes])      , [with_tk=yes])
# Line 1181  esac Line 1189  esac
1189  #  try to find a static version of the Tk8.0 library  #  try to find a static version of the Tk8.0 library
1190  #  #
1191  if test "X$with_tklib" = X_searching ; then  if test "X$with_tklib" = X_searching ; then
1192      AC_PATH_PROGS(TK_LIB, libtk8.0.a libtk80.a libtk.a, , $asc_tcl_library_dirs)      AC_PATH_PROGS(TK_LIB, libtk8.0.a libtk80.a libtk.a libtk8.3.a, , $asc_tcl_library_dirs)
1193      if test -z "TK_LIB" ; then      if test -z "TK_LIB" ; then
1194          TK_LIB=_searching          TK_LIB=_searching
1195      fi      fi
# Line 2202  AC_SUBST(help_topbuilddir) Line 2210  AC_SUBST(help_topbuilddir)
2210  AC_OUTPUT(  AC_OUTPUT(
2211      ascend4/ConfigAscend:ascend4/ConfigAscend.in      ascend4/ConfigAscend:ascend4/ConfigAscend.in
2212      ascend4/Makefile      ascend4/Makefile
2213      ascend4/bin/ascend      ascend4/bin/ascend4.sh
2214      ascend4/Makefile.Rules:ascend4/Makefile.Rules.in      ascend4/Makefile.Rules:ascend4/Makefile.Rules.in
2215      ascend4/archive/Makefile      ascend4/archive/Makefile
2216      ascend4/bin/Makefile      ascend4/bin/Makefile

Legend:
Removed from v.1  
changed lines
  Added in v.7

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