@@ -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