Commit 01ad4893 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 

into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build
parents 038357dd a9d2569c

cmd-line-utils/libedit/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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

config/ac-macros/misc.m4

+0 −1
Original line number Diff line number Diff line
@@ -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

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -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

include/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -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

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -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