1 files changed, 10 insertions, 4 deletions
diff --git a/autogen.sh b/autogen.sh
index 2b40c1075..70c5f2e8e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,9 +1,15 @@
 #!/bin/sh
 set -e
 
-intltoolize --force --copy --automake
-gtkdocize
-autoreconf -i -f
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
+
+(
+    cd "$srcdir"
+    intltoolize --force --copy --automake
+    gtkdocize
+    autoreconf -i -f
+)
 
 # Honor NOCONFIGURE for compatibility with gnome-autogen.sh
 if test x"$NOCONFIGURE" = x; then
@@ -22,5 +28,5 @@ else
 fi
 
 if test $run_configure = true; then
-    ./configure "$@"
+    "$srcdir/configure" "$@"
 fi