httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r711993 - in /httpd/httpd/trunk: CHANGES acinclude.m4
Date Thu, 06 Nov 2008 22:23:25 GMT
Author: rpluem
Date: Thu Nov  6 14:23:21 2008
New Revision: 711993

URL: http://svn.apache.org/viewvc?rev=711993&view=rev
Log:
* Correctly set SSL_LIBS during openssl detection if pkgconfig is not available.

PR: 46018

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/acinclude.m4

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=711993&r1=711992&r2=711993&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Thu Nov  6 14:23:21 2008
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is
+     not available. PR 46018 [Ruediger Pluem]
+
   *) mod_expires: Do not sets negative max-age / Expires header in the past.
      PR 39774 [Jim Jagielski]
 

Modified: httpd/httpd/trunk/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?rev=711993&r1=711992&r2=711993&view=diff
==============================================================================
--- httpd/httpd/trunk/acinclude.m4 (original)
+++ httpd/httpd/trunk/acinclude.m4 Thu Nov  6 14:23:21 2008
@@ -447,10 +447,10 @@
         pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
         APR_ADDTO(LDFLAGS, [$pkglookup])
       else
-        ap_ssltk_libs="-lssl -lcrypto"
+        ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
       fi
     else
-      ap_ssltk_libs="-lssl -lcrypto"
+      ap_ssltk_libs="-lssl -lcrypto `$apr_config --libs`"
     fi
   fi
   APR_SETVAR(SSL_LIBS, [$ap_ssltk_libs])



Mime
View raw message