Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r730926 - /httpd/httpd/trunk/acinclude.m4
Date: Sat, 03 Jan 2009 06:40:32 -0000
To: cvs@httpd.apache.org
From: jerenkrantz@apache.org
Message-Id: <20090103064032.8AA9C23889A0@eris.apache.org>

Author: jerenkrantz
Date: Fri Jan  2 22:40:32 2009
New Revision: 730926

URL: http://svn.apache.org/viewvc?rev=730926&view=rev
Log:
Make OpenSSL pkg-config usage consistent so that we don't run the early
configure checks against a /usr installed OpenSSL and then link against
a different pkg-config installed OpenSSL.

(Hint: Try with Mac OS X with MacPorts's OpenSSL or FreeBSD w/OpenSSL ports.)

* acinclude.m4
  (APACHE_CHECK_SSL_TOOLKIT): Load in pkg-config variables first before doing
  any OpenSSL checks so that we don't clobber things later.

Modified:
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=730926&r1=730925&r2=730926&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Fri Jan  2 22:40:32 2009
@@ -339,12 +339,13 @@
 AC_DEFUN(APACHE_CHECK_SSL_TOOLKIT,[
 if test "x$ap_ssltk_configured" = "x"; then
   dnl initialise the variables we use
+  ap_ssltk_found=""
   ap_ssltk_base=""
   ap_ssltk_libs=""
   ap_ssltk_type=""
 
   dnl Determine the SSL/TLS toolkit's base directory, if any
-  AC_MSG_CHECKING([for SSL/TLS toolkit base])
+  AC_MSG_CHECKING([for user-provided SSL/TLS toolkit base])
   AC_ARG_WITH(sslc, APACHE_HELP_STRING(--with-sslc=DIR,RSA SSL-C SSL/TLS toolkit), [
     dnl If --with-sslc specifies a directory, we use that directory or fail
     if test "x$withval" != "xyes" -a "x$withval" != "x"; then
@@ -371,7 +372,30 @@
   saved_LIBS="$LIBS"
   saved_LDFLAGS="$LDFLAGS"
   SSL_LIBS=""
-  if test "x$ap_ssltk_base" != "x"; then
+
+  dnl Before doing anything else, load in pkg-config variables (if not sslc).
+  if test "x$ap_ssltk_type" = "x" -a -n "$PKGCONFIG"; then
+    saved_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
+    if test "x$ap_ssltk_base" != "x" -a \
+            -f "${ap_ssltk_base}/lib/pkgconfig/openssl.pc"; then
+      dnl Ensure that the given path is used by pkg-config too, otherwise
+      dnl the system openssl.pc might be picked up instead.
+      PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
+      export PKG_CONFIG_PATH
+    fi
+    ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
+    if test $? -eq 0; then
+      ap_ssltk_found="yes"
+      pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
+      APR_ADDTO(CPPFLAGS, [$pkglookup])
+      APR_ADDTO(INCLUDES, [$pkglookup])
+      pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
+      APR_ADDTO(LDFLAGS, [$pkglookup])
+      APR_ADDTO(SSL_LIBS, [$pkglookup])
+    fi
+    PKG_CONFIG_PATH="$saved_PKG_CONFIG_PATH"
+  fi
+  if test "x$ap_ssltk_base" != "x" -a "x$ap_ssltk_found" = "x"; then
     APR_ADDTO(CPPFLAGS, [-I$ap_ssltk_base/include])
     APR_ADDTO(INCLUDES, [-I$ap_ssltk_base/include])
     APR_ADDTO(LDFLAGS, [-L$ap_ssltk_base/lib])
@@ -433,29 +457,9 @@
     AC_MSG_ERROR([...No recognized SSL/TLS toolkit detected])
   fi
 
-  if test "$ap_ssltk_type" = "openssl"; then
-    if test "x$ap_ssltk_base" != "x" -a \
-            -f "${ap_ssltk_base}/lib/pkgconfig/openssl.pc"; then
-      dnl Ensure that the given path is used by pkg-config too, otherwise
-      dnl the system openssl.pc might be picked up instead.
-      PKG_CONFIG_PATH="${ap_ssltk_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
-      export PKG_CONFIG_PATH
-    fi
-    if test -n "$PKGCONFIG"; then
-      ap_ssltk_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
-      if test $? -eq 0; then
-        pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
-        APR_ADDTO(CPPFLAGS, [$pkglookup])
-        APR_ADDTO(INCLUDES, [$pkglookup])
-        pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
-        APR_ADDTO(LDFLAGS, [$pkglookup])
-        APR_ADDTO(SSL_LIBS, [$pkglookup])
-      else
-        ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
-      fi
-    else
-      ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
-    fi
+  if test "$ap_ssltk_type" = "openssl" -a "x$ap_ssltk_found" = "x"; then
+    ap_ssltk_found="yes"
+    ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
   fi
   APR_ADDTO(SSL_LIBS, [$ap_ssltk_libs])
   APR_ADDTO(LIBS, [$ap_ssltk_libs])