Skip to content

Commit

Permalink
Bug#51607: Automake distcheck target broken.
Browse files Browse the repository at this point in the history
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.
--BZR--
revision-id: [email protected]
property-branch-nick: bugfixing
testament3-sha1: e8696032b9ecec8fa458702e5a58a69fb3451579
  • Loading branch information
vaintroub committed Mar 9, 2010
1 parent 6dbc80d commit f745e2e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions BUILD/choose_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ dist-hook:
--datadir=$(distdir)/win/data \
--srcdir=$(top_srcdir)
storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
test ! -f configure.am || $(INSTALL_DATA) configure.am $(distdir)
test ! -f $(top_srcdir)/configure.am || \
$(INSTALL_DATA) $(top_srcdir)/configure.am $(distdir)

all-local: @ABI_CHECK@

Expand Down

0 comments on commit f745e2e

Please sign in to comment.