From bca5e6ad18074c43980c1dd5cf0e7f1deec25629 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Fri, 16 Jan 1998 11:05:09 +0000 Subject: [PATCH] Updated. --- configure | 180 ++++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 131 insertions(+), 49 deletions(-) diff --git a/configure b/configure index aadd99d..bd2d4e4 100755 --- a/configure +++ b/configure @@ -662,10 +662,50 @@ fi if test "x$prefix" = xNONE; then if test "x$prefix" = xNONE; then echo $ac_n "checking for prefix by $ac_c" 1>&6 +# Extract the first word of "tclsh8.1", so it can be a program name with args. +set dummy tclsh8.1; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:669: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_TCLSH8.1'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$TCLSH8.1" in + /*) + ac_cv_path_TCLSH8.1="$TCLSH8.1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_TCLSH8.1="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +TCLSH8.1="$ac_cv_path_TCLSH8.1" +if test -n "$TCLSH8.1"; then + echo "$ac_t""$TCLSH8.1" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -n "$ac_cv_path_TCLSH8.1"; then + prefix=`echo $ac_cv_path_TCLSH8.1|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` + fi +fi + +fi +if test "x$prefix" = xNONE; then + if test "x$prefix" = xNONE; then +echo $ac_n "checking for prefix by $ac_c" 1>&6 # Extract the first word of "tclsh8.0", so it can be a program name with args. set dummy tclsh8.0; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:669: checking for $ac_word" >&5 +echo "configure:709: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH8.0'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -705,7 +745,7 @@ echo $ac_n "checking for prefix by $ac_c" 1>&6 # Extract the first word of "tclsh7.6", so it can be a program name with args. set dummy tclsh7.6; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:709: checking for $ac_word" >&5 +echo "configure:749: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH7.6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -739,8 +779,48 @@ fi fi fi +if test "x$prefix" = xNONE; then + if test "x$prefix" = xNONE; then +echo $ac_n "checking for prefix by $ac_c" 1>&6 +# Extract the first word of "tclsh7.5", so it can be a program name with args. +set dummy tclsh7.5; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:789: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_TCLSH7.5'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$TCLSH7.5" in + /*) + ac_cv_path_TCLSH7.5="$TCLSH7.5" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_TCLSH7.5="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +TCLSH7.5="$ac_cv_path_TCLSH7.5" +if test -n "$TCLSH7.5"; then + echo "$ac_t""$TCLSH7.5" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -n "$ac_cv_path_TCLSH7.5"; then + prefix=`echo $ac_cv_path_TCLSH7.5|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` + fi +fi + +fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:744: checking how to run the C preprocessor" >&5 +echo "configure:824: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -755,13 +835,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -772,13 +852,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -801,12 +881,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:805: checking for ANSI C header files" >&5 +echo "configure:885: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -814,7 +894,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -831,7 +911,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -849,7 +929,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -870,7 +950,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -881,7 +961,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -908,7 +988,7 @@ if test "$ac_cv_header_stdc" = no; then echo "configure: warning: Your system doesn't seem to support ANSI C" 1>&2 fi echo $ac_n "checking for YAZ directory""... $ac_c" 1>&6 -echo "configure:912: checking for YAZ directory" >&5 +echo "configure:992: checking for YAZ directory" >&5 # Check whether --with-yazdir or --without-yazdir was given. if test "${with_yazdir+set}" = set; then withval="$with_yazdir" @@ -916,7 +996,7 @@ if test "${with_yazdir+set}" = set; then fi if test "$YAZDIR" = "yes"; then - YAZDIR="../yaz-1.2" + YAZDIR="../yaz-1.4" elif test "$YAZDIR" = ""; then YAZDIR=../yaz for i in ../yaz* ../yaz; do @@ -931,7 +1011,7 @@ else echo "$ac_t""$YAZDIR" 1>&6 fi echo $ac_n "checking for MOSI""... $ac_c" 1>&6 -echo "configure:935: checking for MOSI" >&5 +echo "configure:1015: checking for MOSI" >&5 # Check whether --with-mosidir or --without-mosidir was given. if test "${with_mosidir+set}" = set; then withval="$with_mosidir" @@ -964,7 +1044,7 @@ else fi if test -r ${tryprefix}/lib/tclConfig.sh; then echo $ac_n "checking for Tcl""... $ac_c" 1>&6 -echo "configure:968: checking for Tcl" >&5 +echo "configure:1048: checking for Tcl" >&5 source ${tryprefix}/lib/tclConfig.sh TCLLIB="${TCL_LIB_SPEC} ${TCL_LIBS}" TCLINC=-I${TCL_PREFIX}/include @@ -985,7 +1065,7 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:989: checking for $ac_word" >&5 +echo "configure:1069: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1013,12 +1093,12 @@ fi checkBoth=0 echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:1017: checking for connect" >&5 +echo "configure:1097: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -1063,7 +1143,7 @@ fi if test "$tk_checkSocket" = 1; then echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:1067: checking for main in -lsocket" >&5 +echo "configure:1147: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1071,14 +1151,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1104,12 +1184,12 @@ fi tk_oldLibs=$LIBS LIBS="$LIBS -lsocket -lnsl" echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:1108: checking for accept" >&5 +echo "configure:1188: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -1154,12 +1234,12 @@ fi fi echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:1158: checking for gethostbyname" >&5 +echo "configure:1238: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -1200,7 +1280,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:1204: checking for main in -lnsl" >&5 +echo "configure:1284: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1208,14 +1288,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1238,7 +1318,7 @@ fi fi echo $ac_n "checking for Tcl""... $ac_c" 1>&6 -echo "configure:1242: checking for Tcl" >&5 +echo "configure:1322: checking for Tcl" >&5 TCL_VERSION=nope for i in "" 7.4 7.5 7.6 8.0; do if test -r ${tryprefix}/lib/libtcl${i}.a; then @@ -1263,7 +1343,7 @@ echo "configure:1242: checking for Tcl" >&5 fi if test -r ${tryprefix}/lib/tkConfig.sh; then echo $ac_n "checking for Tk""... $ac_c" 1>&6 -echo "configure:1267: checking for Tk" >&5 +echo "configure:1347: checking for Tk" >&5 source ${tryprefix}/lib/tkConfig.sh echo "$ac_t""$TK_VERSION" 1>&6 TKINC=${TK_XINCLUDES} @@ -1271,7 +1351,7 @@ echo "configure:1267: checking for Tk" >&5 IRCLIENT_SHELL=wish${TK_VERSION} else echo $ac_n "checking for Tk""... $ac_c" 1>&6 -echo "configure:1275: checking for Tk" >&5 +echo "configure:1355: checking for Tk" >&5 TK_VERSION=nope for i in "" 4.0 4.1 4.2 8.0; do if test -r ${tryprefix}/lib/libtk${i}.a; then @@ -1294,7 +1374,7 @@ echo "configure:1275: checking for Tk" >&5 # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1298: checking for X" >&5 +echo "configure:1378: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1356,12 +1436,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1430,14 +1510,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1527,12 +1607,12 @@ fi if test "$no_x" = ""; then if test "$x_includes" = ""; then cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1554,12 +1634,12 @@ rm -f conftest* echo checking for X11 header files XINCLUDES="# no special path needed" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1608,7 +1688,7 @@ rm -f conftest* fi if test "$XLIBSW" = nope ; then echo $ac_n "checking for XCreateWindow in -lXwindow""... $ac_c" 1>&6 -echo "configure:1612: checking for XCreateWindow in -lXwindow" >&5 +echo "configure:1692: checking for XCreateWindow in -lXwindow" >&5 ac_lib_var=`echo Xwindow'_'XCreateWindow | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1616,7 +1696,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXwindow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1819,8 +1899,10 @@ s%@IRCLIENT_SHELL@%$IRCLIENT_SHELL%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@TCLSH@%$TCLSH%g +s%@TCLSH8.1@%$TCLSH8.1%g s%@TCLSH8.0@%$TCLSH8.0%g s%@TCLSH7.6@%$TCLSH7.6%g +s%@TCLSH7.5@%$TCLSH7.5%g s%@CPP@%$CPP%g s%@RANLIB@%$RANLIB%g -- 1.7.10.4