mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Switch to using $SSL instead of $NOSSL in configure
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1893 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
12
configure
vendored
12
configure
vendored
@@ -2778,7 +2778,9 @@ fi
|
||||
|
||||
# Check whether --enable-openssl was given.
|
||||
if test "${enable_openssl+set}" = set; then :
|
||||
enableval=$enable_openssl; if test "$enableval" = "no" ; then NOSSL=1; fi
|
||||
enableval=$enable_openssl; SSL="$enableval"
|
||||
else
|
||||
SSL="yes"
|
||||
fi
|
||||
|
||||
# Check whether --enable-perl was given.
|
||||
@@ -3087,7 +3089,7 @@ $as_echo "$as_me: WARNING: \"c-ares was not found and thus disabled\"" >&2;}
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z "$NOSSL"; then
|
||||
if test "x$SSL" != "xno"; then
|
||||
if test -n "$OPENSSL"; then
|
||||
appendLib -L${OPENSSL}/lib
|
||||
appendCXX -I${OPENSSL}/include
|
||||
@@ -3190,9 +3192,9 @@ else
|
||||
fi
|
||||
|
||||
|
||||
if test -z "$NOSSL"; then
|
||||
appendCXX -DHAVE_LIBSSL
|
||||
fi
|
||||
appendCXX -DHAVE_LIBSSL
|
||||
else
|
||||
NOSSL=1
|
||||
fi
|
||||
|
||||
|
||||
|
||||
11
configure.in
11
configure.in
@@ -79,7 +79,8 @@ AC_ARG_ENABLE( [ipv6],
|
||||
[IPV6="yes"])
|
||||
AC_ARG_ENABLE( [openssl],
|
||||
AS_HELP_STRING([--disable-openssl], [disable openssl]),
|
||||
[if test "$enableval" = "no" ; then NOSSL=1; fi],)
|
||||
[SSL="$enableval"],
|
||||
[SSL="yes"])
|
||||
AC_ARG_ENABLE( [perl],
|
||||
AS_HELP_STRING([--disable-perl], [disable perl]),
|
||||
[if test "$enableval" = "no" ; then NOPERL=1; fi],)
|
||||
@@ -143,7 +144,7 @@ Disabling c-ares may result in a slight performance decrease but will not have a
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -z "$NOSSL"; then
|
||||
if test "x$SSL" != "xno"; then
|
||||
if test -n "$OPENSSL"; then
|
||||
appendLib -L${OPENSSL}/lib
|
||||
appendCXX -I${OPENSSL}/include
|
||||
@@ -156,9 +157,9 @@ if test -z "$NOSSL"; then
|
||||
AC_CHECK_LIB( ssl, SSL_shutdown,,
|
||||
AC_MSG_ERROR([could not find libssl. Try --disable-openssl or install the appropriate dependencies eg. libssl-dev.]), )
|
||||
|
||||
if test -z "$NOSSL"; then
|
||||
appendCXX -DHAVE_LIBSSL
|
||||
fi
|
||||
appendCXX -DHAVE_LIBSSL
|
||||
else
|
||||
NOSSL=1
|
||||
fi
|
||||
|
||||
AC_ARG_WITH( [module-prefix],
|
||||
|
||||
Reference in New Issue
Block a user