svn rev #24245: branches/nss/src/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24245
Commit By: ghudson
Log Message:
Simplify the nss backend configure changes.



Changed Files:
U   branches/nss/src/configure.in
Modified: branches/nss/src/configure.in
===================================================================
--- branches/nss/src/configure.in	2010-08-19 20:05:57 UTC (rev 24244)
+++ branches/nss/src/configure.in	2010-08-19 20:20:31 UTC (rev 24245)
@@ -123,28 +123,24 @@
 [CRYPTO_IMPL=$withval
 AC_MSG_RESULT("k5crypto will use \'$withval\'")
 ], withval=builtin)
-AC_CONFIG_COMMANDS(CRYPTO_IMPL, , CRYPTO_IMPL=$CRYPTO_IMPL)
-AC_SUBST(CRYPTO_IMPL)
-#PKG_CHECK_MODULES(CRYPTO_IMPL, $CRYPTO_IMPL, [ withval != builtin ], )
+CRYPTO_IMPL_LIBS=
+CRYPTO_IMPL_CFLAGS=
 case "$withval" in
+builtin)
+  ;;
 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_CFLAGS=`pkg-config --cflags nss`
   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`
+  AC_MSG_ERROR([Unknown crypto implementation $withval])
   ;;
 esac
+AC_CONFIG_COMMANDS(CRYPTO_IMPL, , CRYPTO_IMPL=$CRYPTO_IMPL)
+AC_SUBST(CRYPTO_IMPL)
 AC_SUBST(CRYPTO_IMPL_CFLAGS)
 AC_SUBST(CRYPTO_IMPL_LIBS)