Index: configure ================================================================== --- configure +++ configure @@ -10,21 +10,23 @@ # Defaults: ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - --enable-bsafe Use RSA BSAFE SSL-C libraries instead of the default OpenSSL libraries." + --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" + --with-ssl-dir=DIR SSL root directory" ac_help="$ac_help - enable or disable patented code. Default is patented code enabled." + --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" + --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 @@ -570,12 +572,12 @@ #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 -MINOR_VERSION=4 -PATCHLEVEL=1 +MINOR_VERSION=5 +PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}${PATCHLEVEL} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} @@ -620,11 +622,11 @@ # 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/openssl' + SSL_DIR='/usr/local/ssl' cat >> confdefs.h <<\EOF #define NO_IDEA 1 EOF cat >> confdefs.h <<\EOF @@ -650,11 +652,11 @@ #-------------------------------------------------------------------- if test -z "${OPENSSL}"; then echo $ac_n "checking host type""... $ac_c" 1>&6 -echo "configure:656: checking host type" >&5 +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 @@ -756,11 +758,11 @@ 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:762: checking for $ac_word" >&5 +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. @@ -786,11 +788,11 @@ 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:792: checking for $ac_word" >&5 +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. @@ -837,11 +839,11 @@ 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:843: checking for $ac_word" >&5 +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. @@ -869,11 +871,11 @@ 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:875: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +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' @@ -880,16 +882,16 @@ 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 886 "configure" +#line 888 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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 @@ -911,25 +913,25 @@ 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:917: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +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:922: checking whether we are using GNU C" >&5 +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 <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +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 @@ -944,11 +946,11 @@ 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:950: checking whether ${CC-cc} accepts -g" >&5 +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 @@ -988,11 +990,11 @@ # 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:994: checking for a BSD compatible install" >&5 +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=":" @@ -1054,11 +1056,11 @@ #-------------------------------------------------------------------- if test -n "${OPENSSL}"; then echo $ac_n "checking if libgcc is needed to resolve openssl symbols""... $ac_c" 1>&6 -echo "configure:1060: checking if libgcc is needed to resolve openssl symbols" >&5 +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" @@ -1070,11 +1072,11 @@ 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:1076: checking for gcc library location" >&5 +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 @@ -1082,11 +1084,11 @@ #-------------------------------------------------------------------- # 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:1088: checking whether ${MAKE-make} sets \${MAKE}" >&5 +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 @@ -1116,11 +1118,11 @@ #-------------------------------------------------------------------- # 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:1122: checking for $ac_word" >&5 +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. @@ -1149,16 +1151,16 @@ #-------------------------------------------------------------------- # This macro performs additional compiler tests. #-------------------------------------------------------------------- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1155: checking for Cygwin environment" >&5 +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 <&5; (eval $ac_compile) 2>&5; }; then +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 @@ -1187,17 +1189,17 @@ #-------------------------------------------------------------------- # Determines the correct binary file extension (.o, .obj, .exe etc.) #-------------------------------------------------------------------- echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1193: checking for object suffix" >&5 +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:1199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +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 @@ -1211,23 +1213,23 @@ 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:1217: checking for mingw32 environment" >&5 +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 <&5; (eval $ac_compile) 2>&5; }; then +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 @@ -1242,21 +1244,21 @@ MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1248: checking for executable suffix" >&5 +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:1258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + 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 @@ -1325,11 +1327,11 @@ withval="$with_tcl" with_tclconfig=${withval} fi echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6 -echo "configure:1331: checking for Tcl configuration" >&5 +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 @@ -1396,11 +1398,11 @@ fi fi echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6 -echo "configure:1402: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +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 @@ -1431,47 +1433,70 @@ - echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6 -echo "configure:1438: checking for Tcl private include files" >&5 - - case "`uname -s`" in - *win32* | *WIN32* | *CYGWIN_NT* |*CYGWIN_98*|*CYGWIN_95*) - TCL_TOP_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}`\" - TCL_GENERIC_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/generic`\" - TCL_UNIX_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/unix`\" - TCL_WIN_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/win`\" - TCL_BMAP_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/bitmaps`\" - TCL_TOOL_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/tools`\" - TCL_COMPAT_DIR_NATIVE=\"`${CYGPATH} ${TCL_SRC_DIR}/compat`\" - TCL_PLATFORM_DIR_NATIVE=${TCL_WIN_DIR_NATIVE} - ;; - *) - TCL_TOP_DIR_NATIVE='$(TCL_SRC_DIR)' - TCL_GENERIC_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/generic' - TCL_UNIX_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/unix' - TCL_WIN_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/win' - TCL_BMAP_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/bitmaps' - TCL_TOOL_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/tools' - TCL_COMPAT_DIR_NATIVE='$(TCL_TOP_DIR_NATIVE)/compat' - TCL_PLATFORM_DIR_NATIVE=${TCL_UNIX_DIR_NATIVE} - ;; - esac - - - - - - - - - - TCL_INCLUDES="-I${TCL_GENERIC_DIR_NATIVE} -I${TCL_PLATFORM_DIR_NATIVE}" - - echo "$ac_t""Using srcdir found in tclConfig.sh" 1>&6 + 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: # @@ -1504,11 +1529,11 @@ # So far only Tcl responds to this one. #-------------------------------------------------------------------- echo $ac_n "checking for building with threads""... $ac_c" 1>&6 -echo "configure:1510: checking for building with threads" >&5 +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 @@ -1531,19 +1556,19 @@ *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:1537: checking for pthread_mutex_init in -lpthread" >&5 +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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +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 @@ -1596,11 +1621,11 @@ # building as a shared library instead of a static library. #-------------------------------------------------------------------- echo $ac_n "checking how to build libraries""... $ac_c" 1>&6 -echo "configure:1602: checking how to build libraries" >&5 +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 @@ -1663,11 +1688,11 @@ tcl_dbgx=g ;; esac echo $ac_n "checking for build with symbols""... $ac_c" 1>&6 -echo "configure:1669: checking for build with symbols" >&5 +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 @@ -1812,11 +1837,11 @@ # versions have bugs in the pkg_mkIndex routine. #-------------------------------------------------------------------- echo $ac_n "checking for tclsh""... $ac_c" 1>&6 -echo "configure:1818: checking for tclsh" >&5 +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 @@ -2024,17 +2049,10 @@ 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_TOP_DIR_NATIVE@%$TCL_TOP_DIR_NATIVE%g -s%@TCL_GENERIC_DIR_NATIVE@%$TCL_GENERIC_DIR_NATIVE%g -s%@TCL_UNIX_DIR_NATIVE@%$TCL_UNIX_DIR_NATIVE%g -s%@TCL_WIN_DIR_NATIVE@%$TCL_WIN_DIR_NATIVE%g -s%@TCL_BMAP_DIR_NATIVE@%$TCL_BMAP_DIR_NATIVE%g -s%@TCL_TOOL_DIR_NATIVE@%$TCL_TOOL_DIR_NATIVE%g -s%@TCL_PLATFORM_DIR_NATIVE@%$TCL_PLATFORM_DIR_NATIVE%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 Index: configure.in ================================================================== --- configure.in +++ configure.in @@ -32,12 +32,12 @@ #-------------------------------------------------------------------- PACKAGE=tls MAJOR_VERSION=1 -MINOR_VERSION=4 -PATCHLEVEL=1 +MINOR_VERSION=5 +PATCHLEVEL=0 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}${PATCHLEVEL} NODOT_VERSION=${MAJOR_VERSION}${MINOR_VERSION} AC_SUBST(PACKAGE) @@ -58,11 +58,11 @@ # libraries instead of the default OpenSSL libaries. #-------------------------------------------------------------------- OPENSSL="1" -AC_ARG_ENABLE(bsafe, [ --enable-bsafe Use RSA BSAFE SSL-C libraries instead of the default OpenSSL libraries.], OPENSSL="", 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. @@ -69,11 +69,11 @@ # 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/openssl' + SSL_DIR='/usr/local/ssl' AC_DEFINE(NO_IDEA) AC_DEFINE(NO_RC5) else SSL_DIR='/use/local/sslc' AC_DEFINE(BSAFE) @@ -105,11 +105,11 @@ ;; esac AC_MSG_RESULT(${PLATFORM}) fi -AC_ARG_WITH(ssl-dir, [ --with-ssl-dir=DIR SSL root directory], SSL_DIR=$withval) +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 @@ -137,11 +137,11 @@ #-------------------------------------------------------------------- # Determine if we should use the patented encryption code #-------------------------------------------------------------------- -AC_ARG_ENABLE(patents, [ enable or disable patented code. Default is patented code enabled.], PATENTS=${enableval}, PATENTS=yes) +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 @@ -167,11 +167,11 @@ 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="") + 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) @@ -243,11 +243,11 @@ #-------------------------------------------------------------------- SC_PATH_TCLCONFIG SC_LOAD_TCLCONFIG -SC_PRIVATE_TCL_HEADERS +SC_PUBLIC_TCL_HEADERS #-------------------------------------------------------------------- # A few miscellaneous platform-specific items: # # Define a special symbol for Windows (BUILD_tls in this case) so