From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Mon, 19 Jul 2004 04:27:13 +0000 (+0000)
Subject: Workaround RHEL 3 'cuteness' for OpenSSL by calling pkg-config openssl.
X-Git-Tag: pre_ajp_proxy~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d4387dedc4ad83460bf52fc326c475c64133634;p=apache

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 711e762b82..a553f1c078 100644
--- 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 e256967fc2..75b40ed336 100644
--- 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 ee7a975bac..0922b924c9 100644
--- 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