svn rev #24244: branches/nss/src/ lib/crypto/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24244
Commit By: ghudson
Log Message:
Merge changes from branches/krb5-1-8-nss.  Omit the t_encrypt.c changes
as they are already handled in a different way on trunk.



Changed Files:
U   branches/nss/src/configure.in
U   branches/nss/src/lib/crypto/Makefile.in
A   branches/nss/src/lib/crypto/nss/
Modified: branches/nss/src/configure.in
===================================================================
--- branches/nss/src/configure.in	2010-08-19 20:00:25 UTC (rev 24243)
+++ branches/nss/src/configure.in	2010-08-19 20:05:57 UTC (rev 24244)
@@ -125,6 +125,28 @@
 ], withval=builtin)
 AC_CONFIG_COMMANDS(CRYPTO_IMPL, , CRYPTO_IMPL=$CRYPTO_IMPL)
 AC_SUBST(CRYPTO_IMPL)
+#PKG_CHECK_MODULES(CRYPTO_IMPL, $CRYPTO_IMPL, [ withval != builtin ], )
+case "$withval" in
+openssl)
+  AC_CHECK_LIB(crypto, PKCS7_get_signer_info)
+  CRYPTO_IMPL_LIBS=
+  CRYPTO_IMPL_CFLAGS=
+   ;;
+builtin)
+  CRYPTO_IMPL_LIBS=
+  CRYPTO_IMPL_CFLAGS=
+   ;;
+nss)
+  CRYPTO_IMPL_CFLAGS=`pkg-config --cflags $CRYPTO_IMPL`
+  CRYPTO_IMPL_LIBS="-lnss3 $(pkg-config --libs nss-util)"
+  ;;
+*)
+  CRYPTO_IMPL_CFLAGS=`pkg-config --cflags $CRYPTO_IMPL`
+  CRYPTO_IMPL_LIBS=`pkg-config --libs $CRYPTO_IMPL`
+  ;;
+esac
+AC_SUBST(CRYPTO_IMPL_CFLAGS)
+AC_SUBST(CRYPTO_IMPL_LIBS)
 
 # --with-kdc-kdb-update makes the KDC update the database with last request
 # information and failure information.

Modified: branches/nss/src/lib/crypto/Makefile.in
===================================================================
--- branches/nss/src/lib/crypto/Makefile.in	2010-08-19 20:00:25 UTC (rev 24243)
+++ branches/nss/src/lib/crypto/Makefile.in	2010-08-19 20:05:57 UTC (rev 24244)
@@ -46,7 +46,7 @@
 # link editor and loader support it.
 DEPLIBS=
 SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_EXPLIBS= $(SUPPORT_LIB) @CRYPTO_LIBS@ $(LIBS)
+SHLIB_EXPLIBS= $(SUPPORT_LIB) @CRYPTO_LIBS@ @CRYPTO_IMPL_LIBS@ $(LIBS)
 SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@