diff options
author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-04 22:54:33 +0000 |
---|---|---|
committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2009-01-04 22:54:33 +0000 |
commit | 83e8f11f68fd07cc71bcf96ef119f07dd91f4f92 (patch) | |
tree | 3bfba3ed3a36a413c13b971df52a125df9147096 | |
parent | b632054e5cbb39538b0deeb2691a42cda24a6371 (diff) | |
download | libapr-util-83e8f11f68fd07cc71bcf96ef119f07dd91f4f92.tar.gz |
Fix the saving of the old LIBS, CPPFLAGS and LDFLAGS when OpenSSL
and NSS are detected.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@731379 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | build/crypto.m4 | 17 |
2 files changed, 12 insertions, 8 deletions
@@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with APR-util 1.4.0 + *) Fix the saving of the old LIBS, CPPFLAGS and LDFLAGS when OpenSSL + and NSS are detected. [Graham Leggett, Ruediger Pluem] + *) Add optional dbm, openssl and nss subpackages to the RPM spec file. [Graham Leggett] diff --git a/build/crypto.m4 b/build/crypto.m4 index e1a9500d..71c55f8e 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -49,6 +49,10 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ openssl_have_headers=0 openssl_have_libs=0 + old_libs="$LIBS" + old_cppflags="$CPPFLAGS" + old_ldflags="$LDFLAGS" + AC_ARG_WITH([openssl], [APR_HELP_STRING([--with-openssl=DIR], [specify location of OpenSSL])], [ @@ -61,8 +65,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ elif test "$withval" = "no"; then apu_have_openssl=0 else - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" openssl_CPPFLAGS="-I$withval/include" openssl_LDFLAGS="-L$withval/lib " @@ -92,8 +94,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [ AC_CHECK_DECLS([EVP_PKEY_CTX_new], [], [], [#include <openssl/evp.h>]) - CPPFLAGS="$old_cppflags" - LDFLAGS="$old_ldflags" fi ], [ apu_have_openssl=0 @@ -138,9 +138,14 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ nss_have_headers=0 nss_have_libs=0 + old_libs="$LIBS" + old_cppflags="$CPPFLAGS" + old_ldflags="$LDFLAGS" + AC_ARG_WITH([nss], [APR_HELP_STRING([--with-nss=DIR], [specify location of NSS])], [ + if test "$withval" = "yes"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) if test -n "$PKG_CONFIG"; then @@ -157,8 +162,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ elif test "$withval" = "no"; then apu_have_nss=0 elif test "x$withval" != "x"; then - old_cppflags="$CPPFLAGS" - old_ldflags="$LDFLAGS" nss_CPPFLAGS="-I$withval/include -I$withval/../public" nss_LDFLAGS="-L$withval/lib " @@ -173,8 +176,6 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [ apu_have_nss=1 fi - CPPFLAGS="$old_cppflags" - LDFLAGS="$old_ldflags" fi if test "$apu_have_nss" != "0"; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$nss_CPPFLAGS]) |