diff options
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 4 | ||||
| -rw-r--r-- | config/ac-macros/misc.m4 | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | include/Makefile.am | 7 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index ae6755f1c5c..b7611193aea 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -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 --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 9f84e06fa46..791cd754bc4 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -638,7 +638,6 @@ AC_SUBST(CXX_VERSION) ]) AC_DEFUN([MYSQL_PROG_AR], [ -AC_REQUIRE([MYSQL_CHECK_CXX_VERSION]) case $CXX_VERSION in MIPSpro*) AR=$CXX diff --git a/configure.in b/configure.in index 1d62c8a59d9..eb8e7b831db 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). AM_INIT_AUTOMAKE(mysql, 5.1.21-beta) -AM_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 DOT_FRM_VERSION=6 diff --git a/include/Makefile.am b/include/Makefile.am index 0796341cc91..fe54a7e35e0 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -53,8 +53,11 @@ link_sources: @yassl_h_ln_cmd@ echo timestamp > link_sources -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 --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index c783158b46c..e1b0f29e253 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -28,9 +28,6 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) suite GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run PRESCRIPTS = mysql-test-run.pl mysql-stress-test.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) -test_DATA = std_data/client-key.pem std_data/client-cert.pem \ - std_data/cacert.pem std_data/server-cert.pem \ - std_data/server-key.pem CLEANFILES = $(GENSCRIPTS) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index 0f4760c468f..b6404a33cc4 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -274,7 +274,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 |