bzr commit into mysql-6.0 branch (jperkin:2688)

[Jonathan Perkin]

#At file:///net/astra04/export/home/my/bzr/mysql-6.0.7-alpha-release/

 2688 Jonathan Perkin	2008-09-19
      Fix out-of-srcdir builds.
modified:
  configure.in
  scripts/Makefile.am

=== modified file 'configure.in'
--- a/configure.in	2008-08-28 08:44:13 +0000
+++ b/configure.in	2008-09-19 16:27:49 +0000
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
 AM_INIT_AUTOMAKE(mysql, 6.0.7-alpha)
-AM_CONFIG_HEADER([include/config.h:config.h.in])
+AM_CONFIG_HEADER([include/config.h])
 
 NDB_VERSION_MAJOR=6
 NDB_VERSION_MINOR=2
@@ -2642,7 +2642,7 @@ else
     fi
 
     # if there is no readline, but we want to build with readline, we fail
-    if [test "$want_to_use_readline" = "yes"] && [test ! -d
"./cmd-line-utils/readline"]
+    if [test "$want_to_use_readline" = "yes"] && [test ! -d
"$srcdir/cmd-line-utils/readline"]
     then
 	AC_MSG_ERROR([This commercially licensed MySQL source package can't
 	      be built with libreadline. Please use --with-libedit to use

=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2008-06-26 17:48:42 +0000
+++ b/scripts/Makefile.am	2008-09-19 16:27:49 +0000
@@ -111,7 +111,8 @@ mysqlbug: ${top_builddir}/config.status 
 mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 				mysql_system_tables_fix.sql
 	@echo "Building $@";
-	@cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
+	@cat $(top_srcdir)/scripts/mysql_system_tables.sql \
+             $(top_srcdir)/scripts/mysql_system_tables_fix.sql > $@
 
 #
 # Build mysql_fix_privilege_tables_sql.c from
@@ -124,7 +125,7 @@ mysql_fix_privilege_tables_sql.c: comp_s
 	sleep 2
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
-	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
+	    $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
 
 
 SUFFIXES = .sh