You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by mi...@apache.org on 2009/01/04 23:54:33 UTC
svn commit: r731379 - in /apr/apr-util/trunk: CHANGES build/crypto.m4
Author: minfrin
Date: Sun Jan 4 14:54:33 2009
New Revision: 731379
URL: http://svn.apache.org/viewvc?rev=731379&view=rev
Log:
Fix the saving of the old LIBS, CPPFLAGS and LDFLAGS when OpenSSL
and NSS are detected.
Modified:
apr/apr-util/trunk/CHANGES
apr/apr-util/trunk/build/crypto.m4
Modified: apr/apr-util/trunk/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=731379&r1=731378&r2=731379&view=diff
==============================================================================
--- apr/apr-util/trunk/CHANGES [utf-8] (original)
+++ apr/apr-util/trunk/CHANGES [utf-8] Sun Jan 4 14:54:33 2009
@@ -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]
Modified: apr/apr-util/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/crypto.m4?rev=731379&r1=731378&r2=731379&view=diff
==============================================================================
--- apr/apr-util/trunk/build/crypto.m4 (original)
+++ apr/apr-util/trunk/build/crypto.m4 Sun Jan 4 14:54:33 2009
@@ -49,6 +49,10 @@
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 @@
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_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 @@
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 @@
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 @@
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])