mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
This commit is contained in:
kent@kent-amd64.(none)
commit
c7c8f41894
13 changed files with 99 additions and 107 deletions
|
|
@ -45,16 +45,5 @@ fi
|
|||
|
||||
# Make sure to enable all features that affect "make dist"
|
||||
./configure \
|
||||
--with-embedded-server \
|
||||
--with-archive-storage-engine \
|
||||
--with-blackhole-storage-engine \
|
||||
--with-csv-storage-engine \
|
||||
--with-example-storage-engine \
|
||||
--with-federated-storage-engine \
|
||||
--with-innodb \
|
||||
--with-ssl \
|
||||
--enable-thread-safe-client \
|
||||
--with-extra-charsets=complex \
|
||||
--with-ndbcluster \
|
||||
--with-zlib-dir=bundled
|
||||
--with-ndbcluster
|
||||
make
|
||||
|
|
|
|||
13
Makefile.am
13
Makefile.am
|
|
@ -23,14 +23,22 @@ EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \
|
|||
|
||||
SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
|
||||
@readline_topdir@ sql-common scripts \
|
||||
@thread_dirs@ pstack \
|
||||
pstack \
|
||||
@sql_union_dirs@ unittest storage plugin \
|
||||
@sql_server@ @man_dirs@ tests \
|
||||
netware @libmysqld_dirs@ \
|
||||
mysql-test support-files sql-bench @tools_dirs@ \
|
||||
win
|
||||
|
||||
DIST_SUBDIRS = $(SUBDIRS) BUILD debian
|
||||
DIST_SUBDIRS = . include Docs zlib \
|
||||
cmd-line-utils sql-common scripts \
|
||||
pstack \
|
||||
strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
|
||||
vio sql man tests \
|
||||
netware libmysqld \
|
||||
mysql-test support-files sql-bench server-tools \
|
||||
win \
|
||||
BUILD debian
|
||||
|
||||
DISTCLEANFILES = ac_available_languages_fragment
|
||||
|
||||
|
|
@ -45,7 +53,6 @@ bin-dist: all
|
|||
# Create initial database files for Windows installations.
|
||||
dist-hook:
|
||||
rm -rf `find $(distdir) -type d -name SCCS -print`
|
||||
rm -f `find $(distdir) -type l -print`
|
||||
mkdir -p $(distdir)/win
|
||||
scripts/mysql_install_db --no-defaults --windows \
|
||||
--basedir=$(top_builddir) \
|
||||
|
|
|
|||
|
|
@ -15,14 +15,6 @@ dnl Add defines so yassl is built and linked with
|
|||
dnl ---------------------------------------------------------------------------
|
||||
AC_DEFUN([MYSQL_USE_BUNDLED_YASSL], [
|
||||
|
||||
AC_CONFIG_FILES(extra/yassl/Makefile dnl
|
||||
extra/yassl/taocrypt/Makefile dnl
|
||||
extra/yassl/taocrypt/benchmark/Makefile dnl
|
||||
extra/yassl/taocrypt/src/Makefile dnl
|
||||
extra/yassl/taocrypt/test/Makefile dnl
|
||||
extra/yassl/src/Makefile dnl
|
||||
extra/yassl/testsuite/Makefile)
|
||||
|
||||
with_bundled_yassl="yes"
|
||||
|
||||
yassl_dir="yassl"
|
||||
|
|
@ -167,6 +159,15 @@ dnl macro bails out with error.
|
|||
dnl
|
||||
dnl ------------------------------------------------------------------------
|
||||
AC_DEFUN([MYSQL_CHECK_SSL], [
|
||||
|
||||
AC_CONFIG_FILES(extra/yassl/Makefile dnl
|
||||
extra/yassl/taocrypt/Makefile dnl
|
||||
extra/yassl/taocrypt/benchmark/Makefile dnl
|
||||
extra/yassl/taocrypt/src/Makefile dnl
|
||||
extra/yassl/taocrypt/test/Makefile dnl
|
||||
extra/yassl/src/Makefile dnl
|
||||
extra/yassl/testsuite/Makefile)
|
||||
|
||||
AC_MSG_CHECKING(for SSL)
|
||||
AC_ARG_WITH([ssl],
|
||||
[ --with-ssl[=DIR] Include SSL support],
|
||||
|
|
|
|||
|
|
@ -64,6 +64,9 @@ dnl installation dir ($pkglibdir), so ZLIB_DEPS is set to point to
|
|||
dnl $pkglibdir.
|
||||
|
||||
AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [
|
||||
|
||||
AC_CONFIG_FILES(zlib/Makefile)
|
||||
|
||||
AC_MSG_CHECKING([for zlib compression library])
|
||||
case $SYSTEM_TYPE in
|
||||
*netware* | *modesto*)
|
||||
|
|
@ -124,10 +127,6 @@ case $SYSTEM_TYPE in
|
|||
fi
|
||||
;;
|
||||
esac
|
||||
if test -n "$zlib_dir"
|
||||
then
|
||||
AC_CONFIG_FILES(zlib/Makefile)
|
||||
fi
|
||||
])
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
|
|
|||
35
configure.in
35
configure.in
|
|
@ -2306,8 +2306,7 @@ AC_ARG_WITH([mysqlmanager],
|
|||
if test "$with_mysqlmanager" = "yes" -o \
|
||||
'(' "$with_mysqlmanager:$with_server" = ":yes" -a \
|
||||
-d "$srcdir/server-tools" ')' ; then
|
||||
tools_dirs="$tools_dirs server-tools"
|
||||
AC_CONFIG_FILES(server-tools/Makefile server-tools/instance-manager/Makefile)
|
||||
tools_dirs="server-tools"
|
||||
fi
|
||||
|
||||
AC_SUBST(tools_dirs)
|
||||
|
|
@ -2319,7 +2318,6 @@ if test "$with_embedded_server" = "yes"
|
|||
then
|
||||
libmysqld_dirs=libmysqld
|
||||
|
||||
AC_CONFIG_FILES(libmysqld/Makefile libmysqld/examples/Makefile)
|
||||
# We can't build embedded library without building the server, because
|
||||
# we depend on libmysys, libmystrings, libmyisam, etc.
|
||||
with_server=yes
|
||||
|
|
@ -2404,7 +2402,6 @@ then
|
|||
# For NetWare, do not need readline
|
||||
echo "Skipping readline"
|
||||
else
|
||||
|
||||
if [test "$with_libedit" = "yes"] || [test "$with_libedit" = "undefined"] && [test "$with_readline" = "undefined"]
|
||||
then
|
||||
readline_topdir="cmd-line-utils"
|
||||
|
|
@ -2457,17 +2454,6 @@ then
|
|||
be built with libreadline. Please use --with-libedit to use
|
||||
the bundled version of libedit instead.])
|
||||
fi
|
||||
|
||||
#
|
||||
# if either readline or libedit is enabled - generate Makefile's for both
|
||||
# (to make sure both are included in 'make dist')
|
||||
#
|
||||
if test -n "$readline_basedir"
|
||||
then
|
||||
AC_CONFIG_FILES(cmd-line-utils/Makefile dnl
|
||||
cmd-line-utils/libedit/Makefile dnl
|
||||
cmd-line-utils/readline/Makefile)
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(readline_dir)
|
||||
|
|
@ -2536,7 +2522,6 @@ AC_SUBST(man8_files)
|
|||
sql_server_dirs=
|
||||
sql_server=
|
||||
server_scripts=
|
||||
thread_dirs=
|
||||
|
||||
dnl This probably should be cleaned up more - for now the threaded
|
||||
dnl client is just using plain-old libs.
|
||||
|
|
@ -2549,7 +2534,6 @@ then
|
|||
sql_client_dirs="strings regex mysys dbug extra libmysql client"
|
||||
else
|
||||
sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"
|
||||
AC_CONFIG_FILES(libmysql_r/Makefile)
|
||||
AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should the client be thread safe])
|
||||
fi
|
||||
|
||||
|
|
@ -2584,7 +2568,7 @@ then
|
|||
server_scripts="mysqld_safe mysql_install_db"
|
||||
sql_server_dirs="strings mysys dbug extra regex"
|
||||
|
||||
sql_server="$sql_server vio sql"
|
||||
sql_server="vio sql"
|
||||
fi
|
||||
|
||||
# IMPORTANT - do not modify LIBS past this line - this hack is the only way
|
||||
|
|
@ -2596,7 +2580,6 @@ LIBS="$LIBS $STATIC_NSS_FLAGS"
|
|||
|
||||
AC_SUBST(sql_server_dirs)
|
||||
AC_SUBST(sql_server)
|
||||
AC_SUBST(thread_dirs)
|
||||
AC_SUBST(server_scripts)
|
||||
|
||||
AC_SUBST(mysql_plugin_dirs)
|
||||
|
|
@ -2634,17 +2617,27 @@ esac
|
|||
AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
|
||||
|
||||
# Output results
|
||||
if test -d "pstack" ; then
|
||||
AC_CONFIG_FILES(pstack/Makefile pstack/aout/Makefile)
|
||||
fi
|
||||
if test -d "cmd-line-utils/readline" ; then
|
||||
AC_CONFIG_FILES(cmd-line-utils/readline/Makefile)
|
||||
fi
|
||||
|
||||
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
|
||||
unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
|
||||
unittest/mysys/Makefile unittest/examples/Makefile dnl
|
||||
strings/Makefile regex/Makefile storage/Makefile dnl
|
||||
man/Makefile BUILD/Makefile vio/Makefile dnl
|
||||
libmysql/Makefile client/Makefile dnl
|
||||
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
|
||||
libmysql/Makefile libmysql_r/Makefile client/Makefile dnl
|
||||
sql/Makefile sql/share/Makefile dnl
|
||||
sql/sql_builtin.cc sql-common/Makefile dnl
|
||||
dbug/Makefile scripts/Makefile include/Makefile dnl
|
||||
tests/Makefile Docs/Makefile support-files/Makefile dnl
|
||||
support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile dnl
|
||||
server-tools/Makefile server-tools/instance-manager/Makefile dnl
|
||||
cmd-line-utils/Makefile cmd-line-utils/libedit/Makefile dnl
|
||||
libmysqld/Makefile libmysqld/examples/Makefile dnl
|
||||
mysql-test/Makefile dnl
|
||||
debian/Makefile debian/defs.mk debian/control dnl
|
||||
mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \
|
|||
pkginclude_HEADERS= $(BUILT_SOURCES)
|
||||
DISTCLEANFILES = $(BUILT_SOURCES)
|
||||
SUBDIRS = @yassl_dir@
|
||||
DIST_SUBDIRS = yassl
|
||||
|
||||
# This will build mysqld_error.h, mysqld_ername.h and sql_state.h
|
||||
# NOTE Built files should depend on their sources to avoid
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ libmysqlclient_la_LDFLAGS = $(target_ldflags)
|
|||
EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c CMakeLists.txt
|
||||
noinst_HEADERS = client_settings.h
|
||||
|
||||
# This is called from the toplevel makefile
|
||||
link_sources:
|
||||
set -x; \
|
||||
ss=`echo $(mystringsobjects) | sed "s;\.lo;.c;g"`; \
|
||||
|
|
|
|||
|
|
@ -29,11 +29,10 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
|
|||
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
|
||||
include $(top_srcdir)/libmysql/Makefile.shared
|
||||
|
||||
libmysqlclient_r_la_SOURCES = $(target_sources)
|
||||
no_dist_libmysqlclient_r_la_SOURCES = $(target_sources)
|
||||
libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
|
||||
libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
|
||||
|
||||
# This is called from the toplevel makefile
|
||||
link_sources:
|
||||
set -x; \
|
||||
for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \
|
||||
|
|
|
|||
|
|
@ -78,7 +78,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
|
|||
rpl_injector.cc my_user.c partition_info.cc \
|
||||
sql_servers.cc
|
||||
|
||||
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)
|
||||
libmysqld_int_a_SOURCES= $(libmysqld_sources)
|
||||
nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)
|
||||
libmysqld_a_SOURCES=
|
||||
|
||||
sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES)
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
|
||||
noinst_PROGRAMS = mysql
|
||||
bin_PROGRAMS = mysqltest_embedded mysql_client_test_embedded
|
||||
client_sources = $(mysqltest_embedded_SOURCES) $(mysql_SOURCES)
|
||||
tests_sources = $(mysql_client_test_embedded_SOURCES)
|
||||
client_sources = $(nodist_mysqltest_embedded_SOURCES) $(nodist_mysql_SOURCES)
|
||||
tests_sources = $(nodist_mysql_client_test_embedded_SOURCES)
|
||||
BUILT_SOURCES = link_sources
|
||||
CLEANFILES = $(client_sources) $(tests_sources) $(BUILT_SOURCES)
|
||||
EXTRA_DIST = CMakeLists.txt
|
||||
|
|
@ -41,15 +41,15 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \
|
|||
@NDB_SCI_LIBS@
|
||||
|
||||
mysqltest_embedded_LINK = $(CXXLINK)
|
||||
mysqltest_embedded_SOURCES = mysqltest.c
|
||||
nodist_mysqltest_embedded_SOURCES = mysqltest.c
|
||||
mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a
|
||||
|
||||
mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
|
||||
nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
|
||||
my_readline.h sql_string.h completion_hash.h
|
||||
mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
|
||||
|
||||
mysql_client_test_embedded_LINK = $(CXXLINK)
|
||||
mysql_client_test_embedded_SOURCES = mysql_client_test.c
|
||||
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
## Process this file with automake to create Makefile.in
|
||||
|
||||
SUBDIRS = ndb
|
||||
DIST_SUBDIRS=ndb
|
||||
|
||||
benchdir_root= $(prefix)
|
||||
testdir = $(benchdir_root)/mysql-test
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ AUTOMAKE_OPTIONS = foreign
|
|||
EXTRA_DIST = fulltext/configure.in
|
||||
|
||||
SUBDIRS = @mysql_pg_dirs@
|
||||
DIST_SUBDIRS = daemon_example fulltext
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
|
|||
|
|
@ -106,11 +106,11 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
|
|||
rpl_utility.cc rpl_injector.cc rpl_rli.cc rpl_mi.cc \
|
||||
rpl_reporting.cc \
|
||||
sql_union.cc sql_derived.cc \
|
||||
client.c sql_client.cc mini_client_errors.c pack.c\
|
||||
sql_client.cc \
|
||||
stacktrace.c repl_failsafe.h repl_failsafe.cc \
|
||||
sql_olap.cc sql_view.cc \
|
||||
gstream.cc spatial.cc sql_help.cc sql_cursor.cc \
|
||||
tztime.cc my_time.c my_user.c my_decimal.cc\
|
||||
tztime.cc my_decimal.cc\
|
||||
sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \
|
||||
sp_cache.cc parse_file.cc sql_trigger.cc \
|
||||
event_scheduler.cc event_data_objects.cc \
|
||||
|
|
@ -119,6 +119,8 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \
|
|||
sql_builtin.cc sql_tablespace.cc partition_info.cc \
|
||||
sql_servers.cc
|
||||
|
||||
nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c
|
||||
|
||||
libndb_la_CPPFLAGS= @ndbcluster_includes@
|
||||
libndb_la_SOURCES= ha_ndbcluster.cc \
|
||||
ha_ndbcluster_binlog.cc \
|
||||
|
|
@ -147,6 +149,7 @@ DISTCLEANFILES = $(EXTRA_PROGRAMS)
|
|||
MAINTAINERCLEANFILES = $(BUILT_MAINT_SRC)
|
||||
AM_YFLAGS = -d --verbose
|
||||
|
||||
# These are listed in 'nodist_mysqld_SOURCES'
|
||||
link_sources:
|
||||
rm -f mini_client_errors.c
|
||||
@LN_CP_F@ $(top_srcdir)/libmysql/errmsg.c mini_client_errors.c
|
||||
|
|
|
|||
Loading…
Reference in a new issue