From a78d56f28ad643b543a16d0269923dd2b8651318 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Wed, 30 Jan 2013 09:33:49 +0100 Subject: [PATCH] autogen.sh: allow calling from out-of-tree Signed-off-by: Benjamin Gaignard https://bugzilla.gnome.org/show_bug.cgi?id=692859 --- autogen.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index a444588f4e..7c4c050a3b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,10 +1,16 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=`dirname "$0"` +test -n "$srcdir" || srcdir=. + +olddir=`pwd` +cd "$srcdir" DIE=0 package=gst-plugins-bad srcfile=gst/speed/gstspeed.c +echo "$(pwd)" # Make sure we have common if test ! -f common/gst-autogen.sh; then @@ -109,13 +115,15 @@ test -n "$NOCONFIGURE" && { exit 0 } +cd "$olddir" + echo "+ running configure ... " -test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_DEF_OPT" -test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT" -test ! -z "$CONFIGURE_FILE_OPT" && echo " ./configure enable/disable flags: $CONFIGURE_FILE_OPT" +test ! -z "$CONFIGURE_DEF_OPT" && echo " $srcdir/configure default flags: $CONFIGURE_DEF_OPT" +test ! -z "$CONFIGURE_EXT_OPT" && echo " $srcdir/configure external flags: $CONFIGURE_EXT_OPT" +test ! -z "$CONFIGURE_FILE_OPT" && echo " $srcdir/configure enable/disable flags: $CONFIGURE_FILE_OPT" echo -./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || { +$srcdir/configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT $CONFIGURE_FILE_OPT || { echo " configure failed" exit 1 }