X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=autogen;h=1d593d8217edb89d081ad7a9848dd63f218e21fb;hb=HEAD;hp=2e6bf5a19a32bdc5d0896669215420c6d8d9e74b;hpb=e442edb4d5816c4ad107ad9e71164f845eba70ad;p=debian%2Famanda

diff --git a/autogen b/autogen
index 2e6bf5a..1d593d8 100755
--- a/autogen
+++ b/autogen
@@ -12,7 +12,7 @@ rm -rf autom4te*.cache
 rm -f configure
 
 die() {
-    echo x"${@}" | sed s/^x//
+    echo x"${@}" | sed 's/^x//'
     exit 1
 }
 
@@ -32,9 +32,23 @@ echo "..creating file lists"
     for f in automake/*.am; do echo "EXTRA_DIST += $f" >> "automake/file-list"; done
 )
 
+#set the FULL_VERSION file
+config/set_full_version
+
 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 -e  \
+     's/PKG_PROG_PKG_CONFIG(\[0\.16\])/PKG_PROG_PKG_CONFIG([0.7])/g' \
+     aclocal.m4 > aclocal.m4~ && mv aclocal.m4~ aclocal.m4
+
 echo "..autoconf"
 autoconf || die "autoconf failed"