From a8636b4310c9ea8c72b7a5efbc04c43df606b937 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Jun 2012 01:08:03 +0900 Subject: [PATCH] autogen: fix configure script generation when srcdir != builddir. This patch allows for regenerating the configure script from a build directory that is not the actual source directory. Signed-off-by: Gwenole Beauchesne --- autogen.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3032585..920e77e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,16 +1,17 @@ #!/bin/sh -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +PROJECT="gstreamer-vaapi" -PROJECT=gstreamer-vaapi -TEST_TYPE=-d -FILE=gst-libs +test -n "$srcdir" || srcdir="`dirname \"$0\"`" +test -n "$srcdir" || srcdir=. -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" +if ! test -f "$srcdir/configure.ac"; then + echo "Failed to find the top-level $PROJECT directory" exit 1 -} +fi + +olddir="`pwd`" +cd "$srcdir" mkdir -p m4 @@ -30,6 +31,8 @@ else autoreconf -v --install || exit $? fi +cd "$olddir" + if test -z "$NO_CONFIGURE"; then - ./configure "$@" && echo "Now type 'make' to compile $PROJECT." + $srcdir/configure "$@" && echo "Now type 'make' to compile $PROJECT." fi -- 2.7.4