Re: svn commit: r1394552 - in /apr/apr/trunk: Makefile.in build.conf build/crypto.m4 build/dso.m4 crypto/apr_crypto.c crypto/apr_crypto_commoncrypto.c include/apr.h.in include/apr.hnw include/apr.hw include/apr_crypto.h test/testcrypto.c

[Rainer Jung]

On 05.10.2012 17:36, Graham Leggett wrote:

On 05 Oct 2012, at 5:21 PM, Ruediger Pluem <rpl...@apache.org> wrote:

+      AC_MSG_NOTICE(checking for commoncrypto in $withval)
+      AC_CHECK_HEADERS(CommonCrypto/CommonKeyDerivation.h, 
[commoncrypto_have_headers=1])
+      AC_CHECK_LIB(System, CCKeyDerivationPBKDF, AC_CHECK_LIB(System, 
CCCryptorCreate, [commoncrypto_have_libs=1],,-lcrypto))
+      if test "$commoncrypto_have_headers" != "0" && test "$commoncrypto_have_libs" != 
"0"; then
+        apu_have_commoncrypto=1
+        APR_ADDTO(LDFLAGS, [-L$withval/lib])
+        APR_ADDTO(INCLUDES, [-I$withval/include])
+      fi
+
+      if test "$apu_have_commoncrypto" != "1"; then
+        AC_CHECK_HEADERS(CommonCrypto/CommonKeyDerivation.h, 
[commoncrypto_have_headers=1])
+        AC_CHECK_LIB(System, CCKeyDerivationPBKDF, AC_CHECK_LIB(System, 
CCCryptorCreate, [commoncrypto_have_libs=1],,-lcrypto))
+        if test "$commoncrypto_have_headers" != "0" && test "$commoncrypto_have_libs" != 
"0"; then
+          apu_have_commoncrypto=1
+          APR_ADDTO(LDFLAGS, [-L$withval/lib])
+          APR_ADDTO(INCLUDES, [-I$withval/include])
+        fi
+      fi

Maybe I am missing something, but why doing the same tests again if they failed?

No idea, this is templated off the openssl tests, which seem to do the same 
thing.

I don't see a reason why the openssl tests are done twice, can you confirm?

That part seems to have been added by you back in 2008:

http://svn.apache.org/viewvc?view=revision&revision=692949

Regards,

Rainer