Various builddir != srcdir fixes

Fix autogen.sh to work when run from the builddir.

Also: switch over to using the gobject-introspection Makefile (which is
out-of-tree safe) instead of hardcoding our own version.

https://bugs.freedesktop.org/show_bug.cgi?id=44599

Signed-off-by: David Zeuthen <davidz@redhat.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/autogen.sh b/autogen.sh
index 462fc35..426e875 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-touch ChangeLog
-
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
@@ -14,6 +12,11 @@ DIE=0
     exit 1
 }
 
+olddir=`pwd`
+cd "$srcdir"
+
+touch ChangeLog
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have autoconf installed."
@@ -22,7 +25,7 @@ DIE=0
   DIE=1
 }
 
-(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have libtool installed."
@@ -107,6 +110,8 @@ esac
 
 intltoolize --copy --force --automake                  || exit 1
 
+cd "$olddir"
+
 conf_flags="--enable-maintainer-mode --enable-gtk-doc"
 
 if test x$NOCONFIGURE = x; then