merge

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
 

Makefile.am

@@ -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@