[seahorse] Separate check for GCR and GP11 in building phase.

[Adam Schreiber <sadam src gnome org>]

commit 312277d27e7f8a0a399afaab51a9bc2f58e89419
Author: Pablo Castellano <pablog src gnome org>
Date:   Fri May 14 17:26:47 2010 +0200

    Separate check for GCR and GP11 in building phase.

 configure.in |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/configure.in b/configure.in
index ba88971..ccfc338 100644
--- a/configure.in
+++ b/configure.in
@@ -441,12 +441,18 @@ if test "$enable_pkcs11" = "no"; then
 	echo "disabling pkcs11 support"
 	enable_pkcs11="no"
 else
-	PKG_CHECK_MODULES(GP11, gp11-0 >= 2.29.4 gcr-0 >= 2.25.5, enable_pkcs11="yes", enable_pkcs11="no")
-	if test "$enable_pkcs11" = "yes"; then
-		AC_DEFINE(WITH_PKCS11, 1, [gp11 library available])
+	PKG_CHECK_MODULES(GCR, gcr-0 >= 2.25.5, gcr_is_present="yes", gcr_is_present="no")
+    if test "$gcr_is_present" = "no"; then
+	    echo "disabling pkcs11 support"
+    fi
+	PKG_CHECK_MODULES(GP11, gp11-0 >= 2.29.4, enable_pkcs11="yes", enable_pkcs11="no")
+	if test "$enable_pkcs11" = "yes" && test "$gcr_is_present" = "yes"; then
+	    AC_DEFINE(WITH_PKCS11, 1, [gp11 library available])
 		SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GP11_CFLAGS"
 		SEAHORSE_LIBS="$SEAHORSE_LIBS $GP11_LIBS"
-	fi
+    else
+        enable_pkcs11="no"
+    fi
 fi
 
 AM_CONDITIONAL(WITH_PKCS11, test "$enable_pkcs11" = "yes")