From f0232425558baf7b9543a9682bc8f8d488e2a185 Mon Sep 17 00:00:00 2001 From: psychon Date: Wed, 7 Apr 2010 16:13:17 +0000 Subject: [PATCH] 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 --- configure | 12 +++++++----- configure.in | 11 ++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/configure b/configure index 40c010ab..40eaf4e7 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index ab78462d..cde174cf 100644 --- a/configure.in +++ b/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],