Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.

For more info, see: http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=82369

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104329 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 711e762b82f977ce5f236e708544fb1bac33e78f..a553f1c078d1ac052bf884c7a84c7e497f5ce524 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_ssl: Build on RHEL 3. (RedHat bug: 82369.)  [Justin Erenkrantz]
+
   *) mod_nw_ssl: Added the directive NWSSLUpgradeable to mod_nw_ssl to 
      allow a non-secure connection to be upgraded to secure connections
      [Brad Nicholes]

diff --git a/acinclude.m4 b/acinclude.m4
index e256967fc26230a65b72fd64b1d774d8a802f117..75b40ed3360888a21349addd6a85e70e1092df1b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -381,6 +381,13 @@ if test "x$ap_ssltk_configured" = "x"; then
       ])
       dnl Look for additional, possibly missing headers
       AC_CHECK_HEADERS(openssl/engine.h)
+      if test -n "$PKGCONFIG"; then
+        $PKGCONFIG openssl
+        if test $? -eq 0; then
+          ap_ssltk_inc="$ap_ssltk_inc `$PKGCONFIG --cflags-only-I openssl`"
+          CPPFLAGS="$CPPFLAGS $ap_ssltk_inc"
+        fi
+      fi
     else
       AC_MSG_RESULT([no OpenSSL headers found])
     fi
@@ -468,6 +475,13 @@ if test "x$ap_ssltk_configured" = "x"; then
   # Put SSL libraries in SSL_LIBS.
   if test "$ap_ssltk_type" = "openssl"; then
     APR_SETVAR(SSL_LIBS, [-lssl -lcrypto])
+    if test -n "$PKGCONFIG"; then
+      $PKGCONFIG openssl
+      if test $? -eq 0; then
+        ap_ssltk_libdep=`$PKGCONFIG --libs openssl`
+        APR_ADDTO(SSL_LIBS, $ap_ssltk_libdep)
+      fi
+    fi
   else
     APR_SETVAR(SSL_LIBS, [-lsslc])
   fi

diff --git a/configure.in b/configure.in
index ee7a975bac3f3a43931f5959446701c53c2af988..0922b924c9265fc1a6cc3b69f7d5532ecf099c8f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -246,6 +246,7 @@ dnl ### need to move some of the arguments "up here"
 dnl ## Check for programs
 
 AC_PATH_PROG(RM, rm)
+AC_PATH_PROG(PKGCONFIG, pkg-config)
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S