apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r731291 - in /apr/apr-util/trunk: CHANGES build/crypto.m4 crypto/apr_crypto_nss.c
Date Sun, 04 Jan 2009 21:24:02 GMT


On 01/04/2009 05:28 PM, minfrin@apache.org wrote:
> Author: minfrin
> Date: Sun Jan  4 08:28:51 2009
> New Revision: 731291
> 
> URL: http://svn.apache.org/viewvc?rev=731291&view=rev
> Log:
> apr_crypto_nss: Oh that it was this easy. Use pgk-config to find
> NSS where possible.
> 
> Modified:
>     apr/apr-util/trunk/CHANGES
>     apr/apr-util/trunk/build/crypto.m4
>     apr/apr-util/trunk/crypto/apr_crypto_nss.c

> Modified: apr/apr-util/trunk/build/crypto.m4
> URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/crypto.m4?rev=731291&r1=731290&r2=731291&view=diff
> ==============================================================================
> --- apr/apr-util/trunk/build/crypto.m4 (original)
> +++ apr/apr-util/trunk/build/crypto.m4 Sun Jan  4 08:28:51 2009
> @@ -139,10 +139,17 @@
>    nss_have_libs=0
>  
>    AC_ARG_WITH([nss], 
> -  [APR_HELP_STRING([--with-nss=DIR], [specify location of OpenSSL])],
> +  [APR_HELP_STRING([--with-nss=DIR], [specify location of NSS])],
>    [
>      if test "$withval" = "yes"; then
> -      AC_CHECK_HEADERS(prerror.h nspr4/prerror.h nss/nss.h nss3/nss.h nss/pk11pub.h
nss3/pk11pub.h, [nss_have_headers=1])
> +      AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
> +      if test -n "$PKG_CONFIG"; then
> +        nss_CPPFLAGS=`$PKG_CONFIG --cflags-only-I nss`
> +        nss_LDFLAGS=`$PKG_CONFIG --libs nss`
> +        APR_ADDTO(CPPFLAGS, [$nss_CPPFLAGS])
> +        APR_ADDTO(LDFLAGS, [$nss_LDFLAGS])

      old_cppflags="$CPPFLAGS"
      old_ldflags="$LDFLAGS"

need to be moved before this code. Otherwise we do not restore the correct values later on.

Regards

RĂ¼diger



Mime
View raw message