seahorse r2275 - trunk

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Jul 16 17:28:20 2008
New Revision: 2275
URL: http://svn.gnome.org/viewvc/seahorse?rev=2275&view=rev

Log:
Missing file from last commit.

Modified:
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jul 16 17:28:20 2008
@@ -439,6 +439,28 @@
 fi
 
 dnl ****************************************************************************
+dnl  PKCS11
+dnl ****************************************************************************
+
+AC_ARG_ENABLE(pkcs11,
+	AC_HELP_STRING([--disable-pkcs11],
+		[Support keys and certificates via PKCS#11]))
+	
+if test "$enable_pkcs11" = "no"; then
+	echo "disabling pkcs11 support"
+	enable_pkcs11="no"
+else
+	PKG_CHECK_MODULES(GP11, gp11-0, enable_pkcs11="yes", enable_pkcs11="no")
+	if test "$enable_pkcs11" == "yes"; then
+		AC_DEFINE(WITH_PKCS11, 1, [gp11 library available])
+		SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GP11_CFLAGS"
+		SEAHORSE_LIBS="$SEAHORSE_LIBS $GP11_LIBS"
+	fi
+fi
+
+AM_CONDITIONAL(WITH_PKCS11, test "$enable_pkcs11" == "yes")
+
+dnl ****************************************************************************
 dnl  SSH 
 dnl ****************************************************************************
 
@@ -548,6 +570,7 @@
 pixmaps/22x22/Makefile
 pixmaps/48x48/Makefile
 pixmaps/scalable/Makefile
+pkcs11/Makefile
 src/Makefile
 src/seahorse.desktop.in
 ssh/Makefile
@@ -559,6 +582,7 @@
 dnl ****************************************************************************
 
 echo "
+PKCS11 Support:          $enable_pkcs11
 PGP Support:		 $enable_pgp
   GnuPG Version:         $have_gpg
   GPGME Version:         $have_gpgme