[gentoo-commits] gentoo-x86 commit in gnome-base/gnome-keyring/files: gnome-keyring-2.22.3-pkg-libtasn1.patch

[Gilles Dartiguelongue (eva)]

eva         09/04/27 22:00:10

  Added:                gnome-keyring-2.22.3-pkg-libtasn1.patch
  Log:
  Fix configure with recent libtasn1, bug #266554. Clean up old revisions.
  (Portage version: 2.2_rc31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-pkg-libtasn1.patch?rev=1.1&content-type=text/plain

Index: gnome-keyring-2.22.3-pkg-libtasn1.patch
===================================================================
# Allow configure to succeed with recent versions of libtasn1
# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=266554
# Gnome: https://bugzilla.gnome.org/show_bug.cgi?id=560869
--- a/configure.in	2008-06-30 17:29:13.000000000 +0200
+++ b/configure.in	2009-04-18 12:16:56.000000000 +0200
@@ -381,17 +381,19 @@
 
 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"
 
+AC_PATH_PROG(ASN1PARSER, asn1Parser, no)
+if test "$ASN1PARSER" = "no" ; then
+	AC_MSG_ERROR(asn1Parser tool is not installed)
+fi
+
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.