diff options
| author | Kaspar Brand <kbrand@apache.org> | 2013-01-05 08:54:15 +0100 |
|---|---|---|
| committer | Kaspar Brand <kbrand@apache.org> | 2013-01-05 08:54:15 +0100 |
| commit | 9c396d2432daa1b761833cabef117c27b8efa59a (patch) | |
| tree | d711d57a5aaf18d7f8f47416adce38de08bd8bd5 /acinclude.m4 | |
| parent | fix typo: || not | (diff) | |
| download | apache2-9c396d2432daa1b761833cabef117c27b8efa59a.tar.xz apache2-9c396d2432daa1b761833cabef117c27b8efa59a.zip | |
mod_ssl/ab: only use "--static" for pkg-config when explicity requested
(by adding an "--enable-ssl-staticlib-deps" option to configure)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1429228 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index de2aa3d157..ee273ef099 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -535,17 +535,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 --static --silence-errors openssl`" + 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 --static openssl`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-L openssl`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) - pkglookup="`$PKGCONFIG --libs-only-other --static openssl`" + pkglookup="`$PKGCONFIG $PKGCONFIG_LIBOPTS --libs-only-other openssl`" APR_ADDTO(LDFLAGS, [$pkglookup]) APR_ADDTO(MOD_LDFLAGS, [$pkglookup]) fi |