bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added configure option --enable-openssl-base

Browse source
This commit is contained in:
Gerhard Rieger 2020-12-28 00:38:03 +01:00
parent 1190e8018e
commit bb764784f3
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -29,6 +29,9 @@ Porting:
Solaris 9 does not provide strndup(); added substitute code. Solaris 9 does not provide strndup(); added substitute code.
Thanks to Greg Earle for providing a patch. Thanks to Greg Earle for providing a patch.
Added configure option --enable-openssl-base to specify the location of
a non-OS OpenSSL installation
Testing: Testing:
test.sh now produces a list of tests that could not be performed for test.sh now produces a list of tests that could not be performed for
any reason. This helps to analyse these cases. any reason. This helps to analyse these cases.

32
configure.ac
View file

@ -481,22 +481,33 @@ AC_ARG_ENABLE(openssl, [ --disable-openssl disable OpenSSL support],
*) AC_MSG_RESULT(yes); WITH_OPENSSL=1 ;; *) AC_MSG_RESULT(yes); WITH_OPENSSL=1 ;;
esac], esac],
[ AC_MSG_RESULT(yes); WITH_OPENSSL=1 ]) [ AC_MSG_RESULT(yes); WITH_OPENSSL=1 ])
AC_ARG_ENABLE(openssl_base, [ --enable-openssl-base specify directory with include/ and lib/],
[ OPENSSL_BASE="$enableval" ],
[ unset OPENSSL_BASE ])
# #
if test -n "$WITH_OPENSSL"; then if test -n "$WITH_OPENSSL"; then
if test -n "$OPENSSL_BASE"; then
sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE="$D"
else
AC_MSG_NOTICE(checking for components of OpenSSL) AC_MSG_NOTICE(checking for components of OpenSSL)
# first, we need to find the include file <openssl/ssl.h> # first, we need to find the include file <openssl/ssl.h>
AC_CACHE_VAL(sc_cv_have_openssl_ssl_h, AC_CACHE_VAL(sc_cv_have_openssl_ssl_h,
[AC_TRY_COMPILE([#include <openssl/ssl.h>],[;], [AC_TRY_COMPILE([#include <openssl/ssl.h>],[;],
[sc_cv_have_openssl_ssl_h=yes; OPENSSL_ROOT=""; ], [sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE=""; ],
[sc_cv_have_openssl_ssl_h=no [sc_cv_have_openssl_ssl_h=no
for D in "/sw" "/usr/local" "/opt/freeware" "/usr/sfw" "/usr/local/ssl"; do if [ "$OPENSSL_BASE" ]; then
s="$OPENSSL_BASE"
else
Ds="/sw /usr/local /opt/freeware /usr/sfw /usr/local/ssl"
fi
for D in $Ds; do
I="$D/include" I="$D/include"
i="$I/openssl/ssl.h" i="$I/openssl/ssl.h"
if test -r "$i"; then if test -r "$i"; then
#V_INCL="$V_INCL -I$I" #V_INCL="$V_INCL -I$I"
CPPFLAGS="$CPPFLAGS -I$I" CPPFLAGS="$CPPFLAGS -I$I"
AC_MSG_NOTICE(found $i) AC_MSG_NOTICE(found $i)
sc_cv_have_openssl_ssl_h=yes; OPENSSL_ROOT="$D" sc_cv_have_openssl_ssl_h=yes; OPENSSL_BASE="$D"
break; break;
fi fi
done]) done])
@ -505,17 +516,18 @@ if test -n "$WITH_OPENSSL"; then
AC_DEFINE(HAVE_OPENSSL_SSL_H) AC_DEFINE(HAVE_OPENSSL_SSL_H)
fi fi
AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h) AC_MSG_NOTICE(checked for openssl/ssl.h... $sc_cv_have_openssl_ssl_h)
fi
fi # end checking for openssl/ssl.h fi # end checking for openssl/ssl.h
# #
if test -n "$WITH_OPENSSL" -a "$sc_cv_have_openssl_ssl_h" = 'yes'; then if test -n "$WITH_OPENSSL" -a "$sc_cv_have_openssl_ssl_h" = 'yes'; then
# next, we search for the openssl library (libssl.*) # next, we search for the openssl library (libssl.*)
# interesting: Linux only requires -lssl, FreeBSD requires -lssl -lcrypto # interesting: Linux only requires -lssl, FreeBSD requires -lssl -lcrypto
# Note, version OpenSSL 0.9.7j requires -lcrypto even on Linux. # Note, version OpenSSL 0.9.7j and higher requires -lcrypto even on Linux.
AC_MSG_CHECKING(for libssl) AC_MSG_CHECKING(for libssl)
AC_CACHE_VAL(sc_cv_have_libssl, AC_CACHE_VAL(sc_cv_have_libssl,
[ LIBS0="$LIBS" [ LIBS0="$LIBS"
if test -n "$OPENSSL_ROOT"; then if test -n "$OPENSSL_BASE"; then
L="$OPENSSL_ROOT/lib"; LIBS="$LIBS -L$L -lssl" L="$OPENSSL_BASE/lib"; LIBS="$LIBS -L$L -lssl"
else else
LIBS="$LIBS -lssl" LIBS="$LIBS -lssl"
fi fi
@ -617,8 +629,8 @@ if test -n "$WITH_FIPS"; then
#include <openssl/fips.h>],[;], #include <openssl/fips.h>],[;],
[sc_cv_have_openssl_fips_h=yes; ], [sc_cv_have_openssl_fips_h=yes; ],
[sv_cv_have_openssl_fips_h=no [sv_cv_have_openssl_fips_h=no
if test -n "$OPENSSL_ROOT"; then if test -n "$OPENSSL_BASE"; then
I="$OPENSSL_ROOT/include" I="$OPENSSL_BASE/include"
i="$I/openssl/fips.h" i="$I/openssl/fips.h"
if test -r "$i"; then if test -r "$i"; then
AC_MSG_NOTICE(found $i) AC_MSG_NOTICE(found $i)
@ -641,8 +653,8 @@ if test -n "$WITH_FIPS" -a "$sc_cv_have_openssl_fips_h" = 'yes'; then
[ LIBS0="$LIBS" [ LIBS0="$LIBS"
echo $LIBS | grep -q "\-lcrypto" echo $LIBS | grep -q "\-lcrypto"
if test $? -ne 0; then if test $? -ne 0; then
if test -n "$OPENSSL_ROOT"; then if test -n "$OPENSSL_BASE"; then
L="$OPENSSL_ROOT/lib"; LIBS="$LIBS -L$L -lcrypto" L="$OPENSSL_BASE/lib"; LIBS="$LIBS -L$L -lcrypto"
else else
LIBS="$LIBS -lcrypto" LIBS="$LIBS -lcrypto"
fi fi