bk commit into 5.0 tree (kent:1.2486)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-30 21:09:45+02:00, kent@stripped +5 -0
  Generate "config.h" directly into the "include" directory, later copied
  to "my_config.h". Not to pollute the top directory, and to get more control
  over what is included. Made the include path for "libedit" pick up its own
  "config.h" first.

  cmd-line-utils/libedit/Makefile.am@stripped, 2007-07-30 20:55:49+02:00, kent@stripped +2 -2
    Changed include path so that current directory is taken first, as there
    is a "config.h" there with the same name as the one in top "include".

  config/ac-macros/misc.m4@stripped, 2007-07-30 15:02:15+02:00, kent@stripped +0 -1
    aclocal in automake 1.8 can't handle AC_REQUIRE on
    a user macro defined in the same included file.

  configure.in@stripped, 2007-07-30 20:55:49+02:00, kent@stripped +1 -1
    Generate "config.h" directly into "include", don't pollute top directory

  include/Makefile.am@stripped, 2007-07-30 20:55:49+02:00, kent@stripped +5 -2
    Copy "config.h" from current directory to "my_config.h", added note in
    the make file why there are two identical files with different name.

  scripts/make_binary_distribution.sh@stripped, 2007-07-30 20:55:49+02:00, kent@stripped +1
-1
    Removed copy of "config.h" from top directory, it is in "include" in a
    source tree.

diff -Nrup a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am
--- a/cmd-line-utils/libedit/Makefile.am	2005-09-24 15:51:27 +02:00
+++ b/cmd-line-utils/libedit/Makefile.am	2007-07-30 20:55:49 +02:00
@@ -5,8 +5,8 @@
 ASRC =			$(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
 AHDR =			vi.h emacs.h common.h
 
-INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
-			-I$(srcdir)/../.. -I..
+# Make sure to include stuff from this directory first, to get right "config.h"
+INCLUDES =		-I. -I$(top_builddir)/include -I$(top_srcdir)/include
 
 noinst_LIBRARIES =	libedit.a
 
diff -Nrup a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4
--- a/config/ac-macros/misc.m4	2007-03-09 10:17:18 +01:00
+++ b/config/ac-macros/misc.m4	2007-07-30 15:02:15 +02:00
@@ -763,7 +763,6 @@ AC_SUBST(CXX_VERSION)
 ])
 
 AC_DEFUN([MYSQL_PROG_AR], [
-AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])
 case $CXX_VERSION in
   MIPSpro*)
     AR=$CXX
diff -Nrup a/configure.in b/configure.in
--- a/configure.in	2007-07-20 09:20:44 +02:00
+++ b/configure.in	2007-07-30 20:55:49 +02:00
@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
 AM_INIT_AUTOMAKE(mysql, 5.0.48)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 PROTOCOL_VERSION=10
 DOT_FRM_VERSION=6
diff -Nrup a/include/Makefile.am b/include/Makefile.am
--- a/include/Makefile.am	2007-07-19 14:13:01 +02:00
+++ b/include/Makefile.am	2007-07-30 20:55:49 +02:00
@@ -49,8 +49,11 @@ link_sources:
 	@readline_h_ln_cmd@
 	@yassl_h_ln_cmd@
 
-my_config.h: ../config.h
-	$(CP) ../config.h my_config.h
+# We want both "my_config.h" and "config.h" that are identical, as
+# MySQL sources assumes the name "my_config.h", and 3rd party sources
+# assumes the name "config.h".
+my_config.h: config.h
+	$(CP) config.h my_config.h
 
 # These files should not be included in distributions since they are
 # generated by configure from the .h.in files
diff -Nrup a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
--- a/scripts/make_binary_distribution.sh	2007-07-26 11:03:13 +02:00
+++ b/scripts/make_binary_distribution.sh	2007-07-30 20:55:49 +02:00
@@ -257,7 +257,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
     rm -f $BASE/lib/*.la
 fi
 
-copyfileto $BASE/include config.h include/*
+copyfileto $BASE/include include/*
 
 rm -f $BASE/include/Makefile* $BASE/include/*.in $BASE/include/config-win.h
 if [ $BASE_SYSTEM != "netware" ] ; then