]> granicus.if.org Git - apache/commit
Merge r1428184, r1429228 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 30 Jan 2013 16:25:31 +0000 (16:25 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 30 Jan 2013 16:25:31 +0000 (16:25 +0000)
commitcbcc528db81a7bb3c79d194c7d89abb487be4272
tree27a3dca5ca808ae13c77474dcad94396348c39db
parent8487eaaacde66e7542aa8e237e3fa98f621ef58a
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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1440507 13f79535-47bb-0310-9956-ffa450edef68
STATUS
acinclude.m4