From f5c84c55ab302aa7556e75a2059ae9f348c36753 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Jul 08 2010 16:54:53 +0000
Subject: Workaround autoconf 2.66


---

diff --git a/pkg-config-dnl.patch b/pkg-config-dnl.patch
new file mode 100644
index 0000000..f68f271
--- /dev/null
+++ b/pkg-config-dnl.patch
@@ -0,0 +1,21 @@
+diff -up pkg-config-0.25/pkg.m4.dnl pkg-config-0.25/pkg.m4
+--- pkg-config-0.25/pkg.m4.dnl	2010-07-08 12:49:24.795813001 -0400
++++ pkg-config-0.25/pkg.m4	2010-07-08 12:49:52.804680655 -0400
+@@ -135,7 +135,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT])
++_PKG_TEXT])dnl
+         ])
+ elif test $pkg_failed = untried; then
+      	AC_MSG_RESULT([no])
+@@ -146,7 +146,7 @@ path to pkg-config.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+         ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/pkgconfig.spec b/pkgconfig.spec
index fa6e4b8..412cdd8 100644
--- a/pkgconfig.spec
+++ b/pkgconfig.spec
@@ -1,7 +1,7 @@
 Summary: A tool for determining compilation options
 Name: pkgconfig
 Version: 0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://pkgconfig.freedesktop.org
@@ -14,6 +14,9 @@ BuildRequires: popt-devel
 Patch2:  pkg-config-0.21-compat-loop.patch
 # https://bugs.freedesktop.org/show_bug.cgi?id=16095
 Patch3: pkg-config-lib64-excludes.patch
+# workaround for breakage with autoconf 2.66
+# https://bugzilla.redhat.com/show_bug.cgi?id=611781
+Patch4: pkg-config-dnl.patch
 
 Provides: pkgconfig(pkg-config) = %{version}
 
@@ -26,6 +29,7 @@ compiler and linker flags.
 %setup -n pkg-config-%{version} -q
 %patch2 -p1 -b .compat-loop
 %patch3 -p0 -b .lib64
+%patch4 -p1 -b .dnl
 
 %build
 %configure \
@@ -53,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/pkg-config
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jul  8 2010 Matthias Clasen <mclasen@redhat.com> 0.25-2
+- Workaround breakage with autoconf 2.66
+
 * Fri May 28 2010 Matthias Clasen <mclasen@redhat.com> 0.25-1
 - Update to 0.25