[poppler] Branch 'poppler-0.6' - autogen.sh glib/demo

[Albert Astals Cid]

 autogen.sh            |    7 ++++---
 glib/demo/Makefile.am |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b90a6d636f936c82b18dd00d7a8c2d349734366f
Author: Albert Astals Cid <tsdgeos at bluebox.localdomain>
Date:   Mon Oct 22 23:33:03 2007 +0200

    builddir != srcdir fixes by Christian Persch <chpe gnome org>

diff --git a/autogen.sh b/autogen.sh
index 9206991..659e708 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,6 +2,7 @@
 
 # Package name
 PKG_NAME=${PKG_NAME:-Poppler}
+srcdir=$(dirname $0)
 
 # Default version requirements
 REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
@@ -113,11 +114,11 @@ fi
 version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
 
-autoreconf -v -i
+(cd $srcdir && autoreconf -v -i )
 
 if $want_gtk_doc; then
     printbold "Running $GTKDOCIZE..."
-    $GTKDOCIZE --copy || exit 1
+    (cd $srcdir && $GTKDOCIZE --copy) || exit 1
 fi
 
-./configure $@
+$srcdir/configure $@
diff --git a/glib/demo/Makefile.am b/glib/demo/Makefile.am
index d07b1c6..9fa5cca 100644
--- a/glib/demo/Makefile.am
+++ b/glib/demo/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = 					\
 	-I$(top_srcdir)/glib			\
+	-I$(top_builddir)/glib			\
 	$(GTK_TEST_CFLAGS)
 
 if BUILD_GTK_TEST