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: r1440507 - in /httpd/httpd/branches/2.4.x: ./ STATUS
 acinclude.m4 docs/manual/ docs/manual/mod/
Date: Wed, 30 Jan 2013 16:25:31 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20130130162531.D3D4C2388ABC@eris.apache.org>

Author: jim
Date: Wed Jan 30 16:25:31 2013
New Revision: 1440507

URL: http://svn.apache.org/viewvc?rev=1440507&view=rev
Log:
Merge r1428184, r1429228 from trunk:

Improve pkg-config usage for mod_ssl/ab:

also use pkg-config for determining the -l flags (and fall back
to a hardcoded default of "-lssl -lcrypto")

add --static to pkg-config invocations, so that libraries for
static linking are also taken into account (PR 54252 - note that
the additional flags will only appear in modules/ssl/modules.mk
and ab_LDFLAGS, so potential side effects are limited)

separate --libs-only-L and --libs-only-other into two invocations
(can't be used concurrently, only the first takes effect)

use --silence-errors where applicable


mod_ssl/ab: only use "--static" for pkg-config when explicity requested
(by adding an "--enable-ssl-staticlib-deps" option to configure)

Submitted by: kbrand
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/acinclude.m4
    httpd/httpd/branches/2.4.x/docs/manual/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/   (props changed)

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1428184,1429228

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1440507&r1=1440506&r2=1440507&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jan 30 16:25:31 2013
@@ -187,14 +187,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch:  trunk patch works.
     +1: humbedooh, covener
 
-   * mod_ssl/ab: improve pkg-config usage in configure (addresses PR 54252)
-     trunk patch: https://svn.apache.org/viewvc/httpd/httpd/trunk/acinclude.m4?r1=1396440&r2=1429228
-     2.4.x patch: trunk patch works
-     +1: kbrand, jorton, jerenkrantz
-     -1: jim: patch doesn't apply (2 out of 2 hunks FAILED -- saving rejects to file acinclude.m4.rej)
-         kbrand: applying svn diff -r 1396440:1429228 https://svn.apache.org/repos/asf/httpd/httpd/trunk/acinclude.m4
-                 works for me - what patch did you apply? (note that it's the
-                 combination of two commits, namely r1428184 and r1429228)
 
 A list of further possible backports can be found at:
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt

Modified: httpd/httpd/branches/2.4.x/acinclude.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/acinclude.m4?rev=1440507&r1=1440506&r2=1440507&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/acinclude.m4 (original)
+++ httpd/httpd/branches/2.4.x/acinclude.m4 Wed Jan 30 16:25:31 2013
@@ -517,14 +517,22 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
         PKG_CONFIG_PATH="${ap_openssl_base}/lib/pkgconfig${PKG_CONFIG_PATH+:}${PKG_CONFIG_PATH}"
         export PKG_CONFIG_PATH
       fi
-      ap_openssl_libs="`$PKGCONFIG --libs-only-l openssl 2>&1`"
+      AC_ARG_ENABLE(ssl-staticlib-deps,APACHE_HELP_STRING(--enable-ssl-staticlib-deps,[link mod_ssl with dependencies of OpenSSL's static libraries (as indicated by "pkg-config --static"). Must be specified in addition to --enable-ssl.]), [
+        if test "$enableval" = "yes"; then
+          PKGCONFIG_LIBOPTS="--static"
+        fi
+      ])
+      ap_openssl_libs="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-l --silence-errors openssl`"
       if test $? -eq 0; then
         ap_openssl_found="yes"
         pkglookup="`$PKGCONFIG --cflags-only-I openssl`"
         APR_ADDTO(CPPFLAGS, [$pkglookup])
         APR_ADDTO(MOD_CFLAGS, [$pkglookup])
         APR_ADDTO(ab_CFLAGS, [$pkglookup])
-        pkglookup="`$PKGCONFIG --libs-only-L --libs-only-other openssl`"
+        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`"
+        APR_ADDTO(LDFLAGS, [$pkglookup])
+        APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
+        pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`"
         APR_ADDTO(LDFLAGS, [$pkglookup])
         APR_ADDTO(MOD_LDFLAGS, [$pkglookup])
       fi
@@ -557,7 +565,7 @@ AC_DEFUN(APACHE_CHECK_OPENSSL,[
       [AC_MSG_RESULT(FAILED)])
 
     if test "x$ac_cv_openssl" = "xyes"; then
-      ap_openssl_libs="-lssl -lcrypto `$apr_config --libs`"
+      ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`"
       APR_ADDTO(MOD_LDFLAGS, [$ap_openssl_libs])
       APR_ADDTO(LIBS, [$ap_openssl_libs])
       APR_SETVAR(ab_LDFLAGS, [$MOD_LDFLAGS])

Propchange: httpd/httpd/branches/2.4.x/docs/manual/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual:r1428184,1429228

Propchange: httpd/httpd/branches/2.4.x/docs/manual/mod/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk/docs/manual/mod:r1428184,1429228