apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r731380 - in /apr/apr-util/branches/1.4.x: ./ CHANGES build/crypto.m4
Date Sun, 04 Jan 2009 22:56:25 GMT
Author: minfrin
Date: Sun Jan  4 14:56:25 2009
New Revision: 731380

URL: http://svn.apache.org/viewvc?rev=731380&view=rev
Log:
Backport r731379 to the apr-util v1.4 branch.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/CHANGES
    apr/apr-util/branches/1.4.x/build/crypto.m4

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  4 14:56:25 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293
+/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=731380&r1=731379&r2=731380&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Sun Jan  4 14:56:25 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/branches/1.4.x/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/crypto.m4?rev=731380&r1=731379&r2=731380&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/crypto.m4 Sun Jan  4 14:56:25 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])



Mime
View raw message