From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Sun, 2 May 2010 18:47:44 +0000 (+0200)
Subject: Resurrect --with(out)-openssl. Controls if openssl should be used, not the same as... 
X-Git-Tag: SQUID_3_2_0_1~241
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3b2879873233891c0b1b73eb89167b27d5c83da;p=thirdparty%2Fsquid.git

Resurrect --with(out)-openssl. Controls if openssl should be used, not the same as --enable-ssl
---

diff --git a/configure.in b/configure.in
index 9eabe54dc8..73b72a2fd5 100644
--- a/configure.in
+++ b/configure.in
@@ -1109,7 +1109,8 @@ AC_ARG_WITH(openssl,
                   installation can be specified if outside of the
                   system standard directories]), [ 
 case "$with_openssl" in
-  yes|no) AC_MSG_ERROR([--with-openssl requires a path argument])
+  yes|no)
+    : # Nothing special to do here
     ;;
   *)
     if test ! -d $withval ; then
@@ -1117,13 +1118,14 @@ case "$with_openssl" in
     fi
     SSLLIBDIR="$with_openssl/lib"
     CPPFLAGS="-I$with_openssl/include $CPPFLAGS"
-    enable_ssl=yes
+    with_openssl=yes
   esac
 ])
-AC_MSG_NOTICE([Using OpenSSL MD5 implementation: $enable_ssl])
+AC_MSG_NOTICE([SSL/TLS Support: $with_openssl])
 SQUID_DEFINE_UNQUOTED(USE_SSL,$enable_ssl,
    [Define this to include code for SSL gatewaying support])
-SQUID_DEFINE_UNQUOTED(USE_OPENSSL,$enable_ssl,
+AC_MSG_NOTICE([Using OpenSSL MD5 implementation: $with_openssl])
+SQUID_DEFINE_UNQUOTED(USE_OPENSSL,$with_openssl,
    [Define this to make use of the OpenSSL libraries for MD5 calculation rather than Squid-supplied MD5 implementation or if building with SSL encryption])
 if test "$enable_ssl" = "yes"; then
   if test -z "$SSLLIB"; then