Overview
| Comment: | Updated acinclude.m4 file to add include path check for Mac installs. Corrected check for not null to instead check for not zero length variables. Fixed variable delimiter syntax error. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
881da2c51a3f4bf11b06fcb7113e2e7c |
| User & Date: | bohagan on 2024-02-28 04:25:23 |
| Other Links: | manifest | tags |
Context
|
2024-02-28
| ||
| 04:42 | In password callback, added check for password > max size. Also added null terminator. check-in: 3866a025e0 user: bohagan tags: trunk | |
| 04:25 | Updated acinclude.m4 file to add include path check for Mac installs. Corrected check for not null to instead check for not zero length variables. Fixed variable delimiter syntax error. check-in: 881da2c51a user: bohagan tags: trunk | |
| 02:55 | More README file updates to remove old options and add more path info check-in: a72acac266 user: bohagan tags: trunk | |
Changes
Modified acinclude.m4 from [7f4a09fb4a] to [0103c1481a].
| ︙ | ︙ | |||
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | [path to root directory of OpenSSL or LibreSSL installation] ), [ openssldir="$withval" ], [ openssldir='' ] ) dnl Set SSL include files path AC_ARG_WITH([openssl-includedir], AS_HELP_STRING([--with-openssl-includedir=<dir>], [path to include directory of OpenSSL or LibreSSL installation] ), [ opensslincludedir="$withval" ], [ | > > | > > > | > | | | | | | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
[path to root directory of OpenSSL or LibreSSL installation]
), [
openssldir="$withval"
], [
openssldir=''
]
)
AC_MSG_CHECKING([for OpenSSL directory])
AC_MSG_RESULT($openssldir)
dnl Set SSL include files path
AC_ARG_WITH([openssl-includedir],
AS_HELP_STRING([--with-openssl-includedir=<dir>],
[path to include directory of OpenSSL or LibreSSL installation]
), [
opensslincludedir="$withval"
], [
if test ! -z "$openssldir"; then
if test -d "${openssldir}/include/openssl"; then
opensslincludedir="${openssldir}/include/openssl"
else
opensslincludedir="${openssldir}/include"
fi
else
opensslincludedir=''
fi
]
)
AC_MSG_CHECKING([for OpenSSL include directory])
AC_MSG_RESULT($opensslincludedir)
dnl Set SSL include vars
if test ! -z "$opensslincludedir"; then
if test -f "$opensslincludedir/ssl.h"; then
TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
else
AC_MSG_ERROR([Unable to locate ssl.h])
fi
else
TCLTLS_SSL_CFLAGS="-I${includedir}/openssl"
TCLTLS_SSL_INCLUDES="-I${includedir}/openssl"
fi
dnl Set SSL lib files path
AC_ARG_WITH([openssl-libdir],
AS_HELP_STRING([--with-openssl-libdir=<dir>],
[path to lib directory of OpenSSL or LibreSSL installation]
), [
openssllibdir="$withval"
], [
if test ! -z "$openssldir"; then
if test "$do64bit" == 'yes'; then
openssllibdir="$openssldir/lib64"
else
openssllibdir="$openssldir/lib"
fi
else
openssllibdir=''
fi
]
)
AC_MSG_CHECKING([for OpenSSL lib directory])
AC_MSG_RESULT($openssllibdir)
dnl Set SSL lib vars
if test ! -z "$openssllibdir"; then
if test -f "$openssllibdir/libssl${SHLIB_SUFFIX}"; then
if test "${TCLEXT_TLS_STATIC_SSL}" == 'no'; then
TCLTLS_SSL_LIBS="-L$openssllibdir -lcrypto -lssl"
else
# Linux and Solaris
TCLTLS_SSL_LIBS="-Wl,-Bstatic `$PKG_CONFIG --static --libs crypto ssl` -Wl,-Bdynamic"
# HPUX
|
| ︙ | ︙ |
Modified configure from [e2f07628de] to [1db5aa2bec].
| ︙ | ︙ | |||
9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 |
else $as_nop
openssldir=''
fi
# Check whether --with-openssl-includedir was given.
if test ${with_openssl_includedir+y}
then :
withval=$with_openssl_includedir;
opensslincludedir="$withval"
else $as_nop
| > > > > | > > > | > | | | | | | 9179 9180 9181 9182 9183 9184 9185 9186 9187 9188 9189 9190 9191 9192 9193 9194 9195 9196 9197 9198 9199 9200 9201 9202 9203 9204 9205 9206 9207 9208 9209 9210 9211 9212 9213 9214 9215 9216 9217 9218 9219 9220 9221 9222 9223 9224 9225 9226 9227 9228 9229 9230 9231 9232 9233 9234 9235 9236 9237 9238 9239 9240 9241 9242 9243 9244 9245 9246 9247 9248 9249 9250 9251 9252 9253 9254 9255 9256 9257 9258 9259 9260 9261 9262 9263 9264 |
else $as_nop
openssldir=''
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL directory" >&5
printf %s "checking for OpenSSL directory... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssldir" >&5
printf "%s\n" "$openssldir" >&6; }
# Check whether --with-openssl-includedir was given.
if test ${with_openssl_includedir+y}
then :
withval=$with_openssl_includedir;
opensslincludedir="$withval"
else $as_nop
if test ! -z "$openssldir"; then
if test -d "${openssldir}/include/openssl"; then
opensslincludedir="${openssldir}/include/openssl"
else
opensslincludedir="${openssldir}/include"
fi
else
opensslincludedir=''
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL include directory" >&5
printf %s "checking for OpenSSL include directory... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $opensslincludedir" >&5
printf "%s\n" "$opensslincludedir" >&6; }
if test ! -z "$opensslincludedir"; then
if test -f "$opensslincludedir/ssl.h"; then
TCLTLS_SSL_CFLAGS="-I$opensslincludedir"
TCLTLS_SSL_INCLUDES="-I$opensslincludedir"
else
as_fn_error $? "Unable to locate ssl.h" "$LINENO" 5
fi
else
TCLTLS_SSL_CFLAGS="-I${includedir}/openssl"
TCLTLS_SSL_INCLUDES="-I${includedir}/openssl"
fi
# Check whether --with-openssl-libdir was given.
if test ${with_openssl_libdir+y}
then :
withval=$with_openssl_libdir;
openssllibdir="$withval"
else $as_nop
if test ! -z "$openssldir"; then
if test "$do64bit" == 'yes'; then
openssllibdir="$openssldir/lib64"
else
openssllibdir="$openssldir/lib"
fi
else
openssllibdir=''
fi
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL lib directory" >&5
printf %s "checking for OpenSSL lib directory... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $openssllibdir" >&5
printf "%s\n" "$openssllibdir" >&6; }
if test ! -z "$openssllibdir"; then
if test -f "$openssllibdir/libssl${SHLIB_SUFFIX}"; then
if test "${TCLEXT_TLS_STATIC_SSL}" == 'no'; then
TCLTLS_SSL_LIBS="-L$openssllibdir -lcrypto -lssl"
else
# Linux and Solaris
TCLTLS_SSL_LIBS="-Wl,-Bstatic `$PKG_CONFIG --static --libs crypto ssl` -Wl,-Bdynamic"
# HPUX
|
| ︙ | ︙ |