Imported Upstream version 2.6.1

[debian/amanda] / autogen

diff --git a/autogen b/autogen
index 2e6bf5a19a32bdc5d0896669215420c6d8d9e74b..c1204ee97198bfb4763553254f8b85a573cb1f11 100755 (executable)
--- a/autogen
+++ b/autogen
@@ -35,6 +35,17 @@ echo "..creating file lists"
 echo "..aclocal"
 aclocal $includes || die "aclocal failed"
 
+echo "...aclocal patches"
+# See http://bugzilla.gnome.org/show_bug.cgi?id=418778
+#
+# The Glib developers are a bit over-eager in their version requirements, requiring
+# an unnecessarily high verison of pkg-config at configure time, when they really
+# only need it at autogen time.  This patch resets the version number in the file
+# just generated by aclocal to the version we've been requiring all along.
+sed --in-place -e  \
+     's/PKG_PROG_PKG_CONFIG(\[0\.16\])/PKG_PROG_PKG_CONFIG([0.7])/g' \
+     aclocal.m4
+
 echo "..autoconf"
 autoconf || die "autoconf failed"