mirror of
https://repo.or.cz/socat.git
synced 2025-07-14 15:23:24 +00:00
Ubuntu Oneiric: OpenSSL w/o SSLv2, bsd/libutil.h, unused vars
This commit is contained in:
parent
76291f6a67
commit
4c9898446d
16 changed files with 98 additions and 74 deletions
14
configure.in
14
configure.in
|
@ -77,7 +77,7 @@ AC_CHECK_HEADERS(termios.h linux/if_tun.h)
|
|||
AC_CHECK_HEADERS(net/if_dl.h)
|
||||
AC_CHECK_HEADERS(linux/types.h linux/errqueue.h)
|
||||
AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
|
||||
AC_CHECK_HEADERS(util.h libutil.h sys/stropts.h regex.h)
|
||||
AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
|
||||
AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
|
||||
|
||||
dnl Checks for setgrent, getgrent and endgrent.
|
||||
|
@ -537,12 +537,12 @@ fi
|
|||
|
||||
# check for fips support
|
||||
AC_MSG_CHECKING(whether to include openssl fips support)
|
||||
AC_ARG_ENABLE(fips, [ --disable-fips disable OpenSSL FIPS support],
|
||||
AC_ARG_ENABLE(fips, [ --enable-fips enable OpenSSL FIPS support],
|
||||
[ case "$enableval" in
|
||||
no) AC_MSG_RESULT(no); WITH_FIPS= ;;
|
||||
*) AC_MSG_RESULT(yes); WITH_FIPS=1 ;;
|
||||
yes) AC_MSG_RESULT(yes); WITH_FIPS=1 ;;
|
||||
*) AC_MSG_RESULT(no); WITH_FIPS= ;;
|
||||
esac],
|
||||
[ AC_MSG_RESULT(yes); WITH_FIPS=1 ])
|
||||
[ AC_MSG_RESULT(no); WITH_FIPS= ])
|
||||
|
||||
if test -n "$WITH_FIPS"; then
|
||||
if test -n "$WITH_OPENSSL"; then
|
||||
|
@ -1274,6 +1274,10 @@ AC_CHECK_FUNC(setenv, AC_DEFINE(HAVE_SETENV),
|
|||
dnl Search for unsetenv()
|
||||
AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV))
|
||||
|
||||
dnl Search for SSLv2_client_method, SSLv2_server_method
|
||||
AC_CHECK_FUNC(SSLv3_client_method, AC_DEFINE(HAVE_SSLv3_client_method), AC_CHECK_LIB(crypt, SSLv3_client_method, [LIBS=-lcrypt $LIBS]))
|
||||
AC_CHECK_FUNC(SSLv2_server_method, AC_DEFINE(HAVE_SSLv2_server_method), AC_CHECK_LIB(crypt, SSLv2_server_method, [LIBS=-lcrypt $LIBS]))
|
||||
|
||||
|
||||
dnl Run time checks
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue