From e8d4f1f2fa855b6da75814d59fdb648e661126fe Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 9 Mar 2010 22:51:36 +0100 Subject: Bug#51607: Automake distcheck target broken. Reason for the error was that ./configure wrapper script was not safe for VPATH builds used by "make distcheck", specifically it expected configure.am to be in the current directory. Fix changes configure wrapper to resolve script names relative to configure script path. Also, use $top_srcdir/configure.am instead of configure.am in dist-hook to be more VPATH friendly. --- BUILD/choose_configure.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'BUILD') diff --git a/BUILD/choose_configure.sh b/BUILD/choose_configure.sh index 476b8b51657..80423205274 100644 --- a/BUILD/choose_configure.sh +++ b/BUILD/choose_configure.sh @@ -5,10 +5,11 @@ # Ensure cmake and perl are there cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no perl --version >/dev/null 2>&1 || HAVE_CMAKE=no +scriptdir=`dirname $0` if test "$HAVE_CMAKE" = "no" then - sh ./configure.am "$@" + sh $scriptdir/configure.am "$@" else - perl ./cmake/configure.pl "$@" + perl $scriptdir/cmake/configure.pl "$@" fi -- cgit v1.2.1