Overview
Comment: | * configure: regen'ed. * configure.in: updated to 1.5.0 for next release. Changed default openssl location to /usr/local/ssl (this is where openssl 0.9.6c installs by default). Changed to use public Tcl headers (private not needed). |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
83ee7c76db579ca38e5eabf6a8eab329 |
User & Date: | hobbs on 2002-02-04 22:46:09 |
Other Links: | manifest | tags |
Context
2002-02-04
| ||
22:46 | * tls.htm: * tls.c: added support for local certificate status check, as well as returning the # of bits in the session key. [Patch #505698] (rose) * tls.c: * tlsIO.c: * tlsBIO.c: added CONSTs to satisfy Tcl 8.4 sources. This may give warnings when compiled against 8.3, but they can be ignored. check-in: c34385bbcd user: hobbs tags: trunk | |
22:46 | * configure: regen'ed. * configure.in: updated to 1.5.0 for next release. Changed default openssl location to /usr/local/ssl (this is where openssl 0.9.6c installs by default). Changed to use public Tcl headers (private not needed). check-in: 83ee7c76db user: hobbs tags: trunk | |
22:45 | * Makefile.in: removed strncasecmp from default object set. This is only needed on the Mac, and Tcl stubs provides it. check-in: 904004a153 user: hobbs tags: trunk | |
Changes
Modified configure
from [64064f82b5]
to [7127a23dd0].
︙ | ︙ | |||
8 9 10 11 12 13 14 | # gives unlimited permission to copy, distribute and modify it. # Defaults: ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help | | | | | > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | # gives unlimited permission to copy, distribute and modify it. # Defaults: ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-bsafe Use RSA BSAFE SSL-C libs. Default is to use OpenSSL libs" ac_help="$ac_help --with-ssl-dir=DIR SSL root directory" ac_help="$ac_help --enable-patents Use patented code. Default is enabled" ac_help="$ac_help --enable-gcc allow use of gcc if available [--disable-gcc]" ac_help="$ac_help --with-gcclib link with libgcc to resolve symbols in a gcc-built openssl library" ac_help="$ac_help --with-tcl directory containing tcl configuration (tclConfig.sh)" ac_help="$ac_help --with-tclinclude directory containing the public Tcl header files." ac_help="$ac_help --enable-threads build with threads" ac_help="$ac_help --enable-shared build and link with shared libraries [--enable-shared]" ac_help="$ac_help --enable-symbols build with debugging symbols [--disable-symbols]" |
︙ | ︙ | |||
568 569 570 571 572 573 574 | # like dots in # library names (Windows). The VERSION variable is # used on the other systems. #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 | | | | 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 | # like dots in # library names (Windows). The VERSION variable is # used on the other systems. #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 MINOR_VERSION=5 PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}${PATCHLEVEL} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} |
︙ | ︙ | |||
618 619 620 621 622 623 624 | # If we're not using OpenSSL, set the root for BSAFE SSL-C. # If we're using BSAFE, define the BSAFE compiler flag. # The "FLAT_INC" flag is used in the BSAFE ssl.h header file and # doesn't seem to be referenced anywhere else. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then | | | 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 | # If we're not using OpenSSL, set the root for BSAFE SSL-C. # If we're using BSAFE, define the BSAFE compiler flag. # The "FLAT_INC" flag is used in the BSAFE ssl.h header file and # doesn't seem to be referenced anywhere else. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then SSL_DIR='/usr/local/ssl' cat >> confdefs.h <<\EOF #define NO_IDEA 1 EOF cat >> confdefs.h <<\EOF #define NO_RC5 1 EOF |
︙ | ︙ | |||
648 649 650 651 652 653 654 | # we're running on before we can figure out some paths. # This step isn't necessary if we're using OpenSSL. #-------------------------------------------------------------------- if test -z "${OPENSSL}"; then echo $ac_n "checking host type""... $ac_c" 1>&6 | | | 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 | # we're running on before we can figure out some paths. # This step isn't necessary if we're using OpenSSL. #-------------------------------------------------------------------- if test -z "${OPENSSL}"; then echo $ac_n "checking host type""... $ac_c" 1>&6 echo "configure:658: checking host type" >&5 case "`uname -s`" in *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*) PLATFORM=WIN32 cat >> confdefs.h <<\EOF #define WINDOWS 1 EOF |
︙ | ︙ | |||
754 755 756 757 758 759 760 | CC=${CC-cc} ;; esac fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | | | 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 | CC=${CC-cc} ;; esac fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:764: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
︙ | ︙ | |||
784 785 786 787 788 789 790 | echo "$ac_t""no" 1>&6 fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | | | 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 | echo "$ac_t""no" 1>&6 fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:794: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
︙ | ︙ | |||
835 836 837 838 839 840 841 | if test -z "$CC"; then case "`uname -s`" in *win32* | *WIN32*) # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 | | | 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 | if test -z "$CC"; then case "`uname -s`" in *win32* | *WIN32*) # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:845: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
︙ | ︙ | |||
867 868 869 870 871 872 873 | ;; esac fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 | | | | | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 | ;; esac fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 echo "configure:877: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF #line 888 "configure" #include "confdefs.h" main(){return(0);} EOF if { (eval echo configure:893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then ac_cv_prog_cc_cross=no else ac_cv_prog_cc_cross=yes fi |
︙ | ︙ | |||
909 910 911 912 913 914 915 | cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 | | | | | | 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 | cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 echo "configure:919: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo "configure:924: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no fi fi echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes else GCC= fi ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo "configure:952: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else |
︙ | ︙ | |||
986 987 988 989 990 991 992 | # IRIX /sbin/install # AIX /bin/install # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 | | | 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 | # IRIX /sbin/install # AIX /bin/install # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo "configure:996: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. |
︙ | ︙ | |||
1052 1053 1054 1055 1056 1057 1058 | # This doesn't seem to be necessary if the RSA BSAFE SSL-C libraries # are used instead of OpenSSL. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then echo $ac_n "checking if libgcc is needed to resolve openssl symbols""... $ac_c" 1>&6 | | | | | 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 | # This doesn't seem to be necessary if the RSA BSAFE SSL-C libraries # are used instead of OpenSSL. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then echo $ac_n "checking if libgcc is needed to resolve openssl symbols""... $ac_c" 1>&6 echo "configure:1062: checking if libgcc is needed to resolve openssl symbols" >&5 # Check whether --with-gcclib or --without-gcclib was given. if test "${with_gcclib+set}" = set; then withval="$with_gcclib" GCCLIB="-lgcc" else GCCLIB="" fi if test "x${GCCLIB}" = "x" ; then echo "$ac_t""no" 1>&6 else echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gcc library location""... $ac_c" 1>&6 echo "configure:1078: checking for gcc library location" >&5 GCCPATH=`${CC} -print-libgcc-file-name | sed -e 's#[^/]*$##'` GCCPATH="-L${GCCPATH}" echo "$ac_t""${GCCPATH}" 1>&6 fi fi #-------------------------------------------------------------------- # Checks to see if the make program sets the $MAKE variable. #-------------------------------------------------------------------- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo "configure:1090: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' |
︙ | ︙ | |||
1114 1115 1116 1117 1118 1119 1120 | #-------------------------------------------------------------------- # Find ranlib #-------------------------------------------------------------------- # 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 | | | 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 | #-------------------------------------------------------------------- # Find ranlib #-------------------------------------------------------------------- # 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:1124: 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 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" |
︙ | ︙ | |||
1147 1148 1149 1150 1151 1152 1153 | #-------------------------------------------------------------------- # This macro performs additional compiler tests. #-------------------------------------------------------------------- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 | | | | | 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 | #-------------------------------------------------------------------- # This macro performs additional compiler tests. #-------------------------------------------------------------------- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 echo "configure:1157: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF #line 1162 "configure" #include "confdefs.h" int main() { #ifndef __CYGWIN__ #define __CYGWIN__ __CYGWIN32__ #endif return __CYGWIN__; ; return 0; } EOF if { (eval echo configure:1173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_cygwin=no |
︙ | ︙ | |||
1185 1186 1187 1188 1189 1190 1191 | test "$ac_cv_cygwin" = yes && CYGWIN=yes #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- echo $ac_n "checking for object suffix""... $ac_c" 1>&6 | | | | | | | | | 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 | test "$ac_cv_cygwin" = yes && CYGWIN=yes #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- echo $ac_n "checking for object suffix""... $ac_c" 1>&6 echo "configure:1195: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext if { (eval echo configure:1201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;; esac done else { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; } fi rm -f conftest* fi echo "$ac_t""$ac_cv_objext" 1>&6 OBJEXT=$ac_cv_objext ac_objext=$ac_cv_objext echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 echo "configure:1219: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF #line 1224 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF if { (eval echo configure:1231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_mingw32=no fi rm -f conftest* rm -f conftest* fi echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 echo "configure:1250: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$CYGWIN" = yes || test "$MINGW32" = yes; then ac_cv_exeext=.exe else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done else |
︙ | ︙ | |||
1323 1324 1325 1326 1327 1328 1329 | # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" with_tclconfig=${withval} fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 | | | 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 | # Check whether --with-tcl or --without-tcl was given. if test "${with_tcl+set}" = set; then withval="$with_tcl" with_tclconfig=${withval} fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 echo "configure:1333: checking for Tcl configuration" >&5 if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # First check to see if --with-tcl was specified. if test x"${with_tclconfig}" != x ; then |
︙ | ︙ | |||
1394 1395 1396 1397 1398 1399 1400 | TCL_BIN_DIR=${ac_cv_c_tclconfig} echo "$ac_t""found $TCL_BIN_DIR/tclConfig.sh" 1>&6 fi fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 | | | 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 | TCL_BIN_DIR=${ac_cv_c_tclconfig} echo "$ac_t""found $TCL_BIN_DIR/tclConfig.sh" 1>&6 fi fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 echo "configure:1404: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then echo "$ac_t""loading" 1>&6 . $TCL_BIN_DIR/tclConfig.sh else echo "$ac_t""file not found" 1>&6 fi |
︙ | ︙ | |||
1429 1430 1431 1432 1433 1434 1435 |
| | | | | | | > | | < | | | < < < > > > | | | | | | | | > > > | > > | > > > > > > > > > | > | > | > | > > > > > | > | > | > < < | 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 | echo $ac_n "checking for Tcl public headers""... $ac_c" 1>&6 echo "configure:1440: checking for Tcl public headers" >&5 # Check whether --with-tclinclude or --without-tclinclude was given. if test "${with_tclinclude+set}" = set; then withval="$with_tclinclude" with_tclinclude=${withval} fi if test x"${with_tclinclude}" != x ; then if test -f "${with_tclinclude}/tcl.h" ; then ac_cv_c_tclh=${with_tclinclude} else { echo "configure: error: ${with_tclinclude} directory does not contain Tcl public header file tcl.h" 1>&2; exit 1; } fi else if eval "test \"`echo '$''{'ac_cv_c_tclh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else # Use the value from --with-tclinclude, if it was given if test x"${with_tclinclude}" != x ; then ac_cv_c_tclh=${with_tclinclude} else # Check in the includedir, if --prefix was specified eval "temp_includedir=${includedir}" for i in \ `ls -d ${TCL_PREFIX}/include 2>/dev/null` \ `ls -d ${temp_includedir} 2>/dev/null` \ `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null` \ /usr/local/include /usr/include ; do if test -f "$i/tcl.h" ; then ac_cv_c_tclh=$i break fi done fi fi fi # Print a message based on how we determined the include path if test x"${ac_cv_c_tclh}" = x ; then { echo "configure: error: tcl.h not found. Please specify its location with --with-tclinclude" 1>&2; exit 1; } else echo "$ac_t""${ac_cv_c_tclh}" 1>&6 fi # Convert to a native path and substitute into the output files. INCLUDE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclh}` TCL_INCLUDES=-I\"${INCLUDE_DIR_NATIVE}\" #-------------------------------------------------------------------- # A few miscellaneous platform-specific items: # # Define a special symbol for Windows (BUILD_tls in this case) so # that we create the export library with the dll. |
︙ | ︙ | |||
1502 1503 1504 1505 1506 1507 1508 | #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # So far only Tcl responds to this one. #-------------------------------------------------------------------- echo $ac_n "checking for building with threads""... $ac_c" 1>&6 | | | 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 | #-------------------------------------------------------------------- # Check whether --enable-threads or --disable-threads was given. # So far only Tcl responds to this one. #-------------------------------------------------------------------- echo $ac_n "checking for building with threads""... $ac_c" 1>&6 echo "configure:1535: checking for building with threads" >&5 # Check whether --enable-threads or --disable-threads was given. if test "${enable_threads+set}" = set; then enableval="$enable_threads" tcl_ok=$enableval else tcl_ok=no fi |
︙ | ︙ | |||
1529 1530 1531 1532 1533 1534 1535 | case "`uname -s`" in *win32* | *WIN32* | *CYGWIN_NT* | *CYGWIN_98* | *CYGWIN_95*) echo "$ac_t""yes" 1>&6 ;; *) echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 | | | | | 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 | case "`uname -s`" in *win32* | *WIN32* | *CYGWIN_NT* | *CYGWIN_98* | *CYGWIN_95*) echo "$ac_t""yes" 1>&6 ;; *) echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6 echo "configure:1562: checking for pthread_mutex_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF #line 1570 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char pthread_mutex_init(); int main() { pthread_mutex_init() ; return 0; } EOF if { (eval echo configure:1581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" |
︙ | ︙ | |||
1594 1595 1596 1597 1598 1599 1600 | #-------------------------------------------------------------------- # The statement below defines a collection of symbols related to # building as a shared library instead of a static library. #-------------------------------------------------------------------- echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 | | | 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 | #-------------------------------------------------------------------- # The statement below defines a collection of symbols related to # building as a shared library instead of a static library. #-------------------------------------------------------------------- echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 echo "configure:1627: checking how to build libraries" >&5 # Check whether --enable-shared or --disable-shared was given. if test "${enable_shared+set}" = set; then enableval="$enable_shared" tcl_ok=$enableval else tcl_ok=yes fi |
︙ | ︙ | |||
1661 1662 1663 1664 1665 1666 1667 | ;; *) tcl_dbgx=g ;; esac echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 | | | 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 | ;; *) tcl_dbgx=g ;; esac echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 echo "configure:1694: checking for build with symbols" >&5 # Check whether --enable-symbols or --disable-symbols was given. if test "${enable_symbols+set}" = set; then enableval="$enable_symbols" tcl_ok=$enableval else tcl_ok=no fi |
︙ | ︙ | |||
1810 1811 1812 1813 1814 1815 1816 | # ${CYGPATH} because it's being used directly by make. # Require that we use a tclsh shell version 8.2 or later since earlier # versions have bugs in the pkg_mkIndex routine. #-------------------------------------------------------------------- echo $ac_n "checking for tclsh""... $ac_c" 1>&6 | | | 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 | # ${CYGPATH} because it's being used directly by make. # Require that we use a tclsh shell version 8.2 or later since earlier # versions have bugs in the pkg_mkIndex routine. #-------------------------------------------------------------------- echo $ac_n "checking for tclsh""... $ac_c" 1>&6 echo "configure:1843: checking for tclsh" >&5 if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else search_path=`echo ${exec_prefix}/bin:${prefix}/bin:${TCL_BIN_DIR}:${TCL_BIN_DIR}/../bin:${PATH} | sed -e 's/:/ /g'` for dir in $search_path ; do |
︙ | ︙ | |||
2022 2023 2024 2025 2026 2027 2028 | s%@TCL_EXTRA_CFLAGS@%$TCL_EXTRA_CFLAGS%g s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g | < < < < < < < | 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 | s%@TCL_EXTRA_CFLAGS@%$TCL_EXTRA_CFLAGS%g s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g s%@TCL_STUB_LIB_FILE@%$TCL_STUB_LIB_FILE%g s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g s%@TCL_STUB_LIB_SPEC@%$TCL_STUB_LIB_SPEC%g s%@TCL_BUILD_STUB_LIB_SPEC@%$TCL_BUILD_STUB_LIB_SPEC%g s%@TCL_INCLUDES@%$TCL_INCLUDES%g s%@CLEANFILES@%$CLEANFILES%g s%@CFLAGS_DEBUG@%$CFLAGS_DEBUG%g s%@CFLAGS_OPTIMIZE@%$CFLAGS_OPTIMIZE%g s%@STLIB_LD@%$STLIB_LD%g s%@SHLIB_LD@%$SHLIB_LD%g s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g |
︙ | ︙ |
Modified configure.in
from [5335334435]
to [44614f1c90].
︙ | ︙ | |||
30 31 32 33 34 35 36 | # like dots in # library names (Windows). The VERSION variable is # used on the other systems. #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 | | | | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | # like dots in # library names (Windows). The VERSION variable is # used on the other systems. #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 MINOR_VERSION=5 PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}${PATCHLEVEL} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} AC_SUBST(PACKAGE) AC_SUBST(VERSION) |
︙ | ︙ | |||
56 57 58 59 60 61 62 | # If the variable OPENSSL is set, we will build with the OpenSSL # libraries. If it is not set, then we will use RSA BSAFE SSL-C # libraries instead of the default OpenSSL libaries. #-------------------------------------------------------------------- OPENSSL="1" | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | # If the variable OPENSSL is set, we will build with the OpenSSL # libraries. If it is not set, then we will use RSA BSAFE SSL-C # libraries instead of the default OpenSSL libaries. #-------------------------------------------------------------------- OPENSSL="1" AC_ARG_ENABLE(bsafe, [ --enable-bsafe Use RSA BSAFE SSL-C libs. Default is to use OpenSSL libs], OPENSSL="", OPENSSL="1") #-------------------------------------------------------------------- # Establish the location of the root directory for OpenSSL. # If we're not using OpenSSL, set the root for BSAFE SSL-C. # If we're using BSAFE, define the BSAFE compiler flag. # The "FLAT_INC" flag is used in the BSAFE ssl.h header file and # doesn't seem to be referenced anywhere else. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then SSL_DIR='/usr/local/ssl' AC_DEFINE(NO_IDEA) AC_DEFINE(NO_RC5) else SSL_DIR='/use/local/sslc' AC_DEFINE(BSAFE) AC_DEFINE(FLAT_INC) fi |
︙ | ︙ | |||
103 104 105 106 107 108 109 | *) PLATFORM=LINUX ;; esac AC_MSG_RESULT(${PLATFORM}) fi | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 | *) PLATFORM=LINUX ;; esac AC_MSG_RESULT(${PLATFORM}) fi AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR SSL root directory], SSL_DIR=$withval) if test ! -d "${SSL_DIR}"; then AC_ERROR(${SSL_DIR} is not a valid directory) fi #-------------------------------------------------------------------- # The OpenSSL and BSAFE SSL-C directory structures differ. |
︙ | ︙ | |||
135 136 137 138 139 140 141 | AC_SUBST(SSL_LIB_DIR) AC_SUBST(SSL_INCLUDE_DIR) #-------------------------------------------------------------------- # Determine if we should use the patented encryption code #-------------------------------------------------------------------- | | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | AC_SUBST(SSL_LIB_DIR) AC_SUBST(SSL_INCLUDE_DIR) #-------------------------------------------------------------------- # Determine if we should use the patented encryption code #-------------------------------------------------------------------- AC_ARG_ENABLE(patents, [ --enable-patents Use patented code. Default is enabled], PATENTS=${enableval}, PATENTS=yes) if test ${PATENTS} = no; then AC_DEFINE("NO_PATENTS") fi #-------------------------------------------------------------------- # Check whether --enable-gcc or --disable-gcc was given. Do this |
︙ | ︙ | |||
165 166 167 168 169 170 171 | # are used instead of OpenSSL. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then AC_MSG_CHECKING(if libgcc is needed to resolve openssl symbols) | | | 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | # are used instead of OpenSSL. #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then AC_MSG_CHECKING(if libgcc is needed to resolve openssl symbols) AC_ARG_WITH(gcclib, [ --with-gcclib link with libgcc to resolve symbols in a gcc-built openssl library], GCCLIB="-lgcc", GCCLIB="") if test "x${GCCLIB}" = "x" ; then AC_MSG_RESULT(no) else AC_MSG_RESULT(yes) AC_MSG_CHECKING(for gcc library location) GCCPATH=`${CC} -print-libgcc-file-name | sed -e 's#[^/]*$##'` |
︙ | ︙ | |||
241 242 243 244 245 246 247 | #-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- SC_PATH_TCLCONFIG SC_LOAD_TCLCONFIG | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | #-------------------------------------------------------------------- # Load the tclConfig.sh file #-------------------------------------------------------------------- SC_PATH_TCLCONFIG SC_LOAD_TCLCONFIG SC_PUBLIC_TCL_HEADERS #-------------------------------------------------------------------- # A few miscellaneous platform-specific items: # # Define a special symbol for Windows (BUILD_tls in this case) so # that we create the export library with the dll. # |
︙ | ︙ |