gnome-keyring r1374 - trunk

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Dec 11 20:16:30 2008
New Revision: 1374
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1374&view=rev

Log:
	* configure.in: Use pkg-config to detect libtasn1. Fixes bug #563702


Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Dec 11 20:16:30 2008
@@ -387,13 +387,9 @@
 
 GKR_LIBTASN1_VERSION=0.3.4
 
-AM_PATH_LIBTASN1($GKR_LIBTASN1_VERSION,,
-	AC_MSG_ERROR([[
-*** 
-*** LibtASN1 ${GKR_LIBTASN1_VERSION} was not found. 
-]]))
-libtasn=yes
-AC_DEFINE_UNQUOTED(GKR_LIBGCRYPT_VERSION, "$GKR_LIBTASN1_VERSION", [Version of libtasn1 we expect])
+PKG_CHECK_MODULES(LIBTASN1,libtasn1 >= 1.0)
+AC_SUBST([LIBTASN1_LIBS])
+AC_SUBST([LIBTASN1_CFLAGS])
 
 DAEMON_CFLAGS="$DAEMON_CFLAGS $LIBTASN1_CFLAGS"
 DAEMON_LIBS="$DAEMON_LIBS $LIBTASN1_LIBS"