Below is the list of changes that have just been committed into a local
4.1 repository of jww. When jww 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://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.1570 03/06/26 14:24:35 jww@xxxxxxxxxxxxxx +3 -0
Makefile.am:
dist_pkgdata_DATA caused error in make distcheck
Moved entries to pkgdata_SCRIPTS.
configure.in, Makefile.am:
Set EXTRA_DIST based on configuration so make dist/distcheck works.
scripts/Makefile.am
1.33 03/06/26 14:23:00 jww@xxxxxxxxxxxxxx +1 -2
dist_pkgdata_DATA caused error in make distcheck
Moved entries to pkgdata_SCRIPTS.
configure.in
1.243 03/06/25 21:55:15 jww@xxxxxxxxxxxxxx +109 -2
Set EXTRA_DIST based on configuration so make dist/distcheck works.
Makefile.am
1.60 03/06/25 21:54:52 jww@xxxxxxxxxxxxxx +4 -2
Set EXTRA_DIST based on configuration so make dist/distcheck works.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jww
# Host: lnxdev.silk.ca
# Root: /usr/src/mysql/mysql-4.1
--- 1.59/Makefile.am Sat Jun 21 13:53:24 2003
+++ 1.60/Makefile.am Wed Jun 25 21:54:52 2003
@@ -30,8 +30,10 @@
BUILD @netware_dir@ os2 @libmysqld_dirs@ \
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
-EXTRA_DIST = libmysql_r bdb innobase libmysqld tools cmd-line-utils/libedit
cmd-line-utils/readline cmd-line-utils sql-common
-
+EXTRA_DIST = @extra_sql_client_dirs@ @extra_sql_server_dirs@ \
+ @extra_thread_dirs@ \
+ @extra_libmysqld_dirs@ @extra_tools_dirs@ \
+ @extra_readline_dir@
# Relink after clean
linked_sources = linked_client_sources linked_server_sources \
--- 1.242/configure.in Fri Jun 20 12:19:16 2003
+++ 1.243/configure.in Wed Jun 25 21:55:15 2003
@@ -2143,16 +2143,28 @@
)
tools_dirs=""
+extra_tools_dirs=""
if test "$with_tools" = "yes"
then
if test "$THREAD_SAFE_CLIENT" = "no"
then
echo "Warning: extra-tools disabled because --enable-thread-safe-client
wasn't used"
else
- tools_dirs="tools"
+ if test -d ${ac_confdir}/tools
+ then
+ tools_dirs="tools"
+ fi
fi
fi
+if test -z "$tools_dirs"
+then
+ if test -d ${ac_confdir}/tools
+ then
+ extra_tools_dirs="tools"
+ fi
+fi
AC_SUBST(tools_dirs)
+AC_SUBST(extra_tools_dirs)
#MYSQL_CHECK_CPU
MYSQL_CHECK_MYSQLFS
@@ -2160,17 +2172,24 @@
MYSQL_CHECK_OPENSSL
libmysqld_dirs=
+extra_libmysqld_dirs=
if test "$with_embedded_server" = "yes"
then
libmysqld_dirs=libmysqld
# We can't build embedded library without building the server, because
# we depend on libmysys, libmystrings, libmyisam, etc.
with_server=yes
+else
+ if test -d ${ac_confdir}/libmysqld
+ then
+ extra_libmysqld_dirs=libmysqld
+ fi
fi
# XXX: We need to add @libmysqld_extra_libs@ (or whatever) so that
# mysql_config --libmysqld-libs will print out something like
# -L/path/to/lib/mysql -lmysqld -lmyisam -lmysys -lmystrings -ldbug ...
AC_SUBST([libmysqld_dirs])
+AC_SUBST([extra_libmysqld_dirs])
# Shall we build the docs?
AC_ARG_WITH(docs,
@@ -2227,6 +2246,7 @@
readline_topdir=""
readline_basedir=""
readline_dir=""
+extra_readline_dir=""
readline_h_ln_cmd=""
readline_link=""
@@ -2245,6 +2265,7 @@
then
readline_topdir="cmd-line-utils"
readline_basedir="libedit"
+ extra_readline_dir="$readline_topdir $readline_topdir/readline"
readline_dir="$readline_topdir/$readline_basedir"
readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a"
readline_h_ln_cmd="\$(LN)
\$(top_srcdir)/cmd-line-utils/libedit/readline/*.h readline/"
@@ -2254,6 +2275,7 @@
then
readline_topdir="cmd-line-utils"
readline_basedir="readline"
+ extra_readline_dir="$readline_topdir $readline_topdir/libedit"
readline_dir="$readline_topdir/$readline_basedir"
readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"
readline_h_ln_cmd="\$(LN) \$(top_srcdir)/cmd-line-utils/readline/*.h
readline/"
@@ -2271,7 +2293,24 @@
fi
fi
+if test -z "$readline_dir"
+then
+ if test -d ${ac_confdir}/cmd-line-utils
+ then
+ extra_readline_dir="cmd-line-utils"
+ if test -d ${ac_confdir}/cmd-line-utils/readline
+ then
+ extra_readline_dir="$extra_readline_dir cmd-line-utils/readline"
+ fi
+ if test -d ${ac_confdir}/cmd-line-utils/libedit
+ then
+ extra_readline_dir="$extra_readline_dir cmd-line-utils/libedit"
+ fi
+ fi
+fi
+
AC_SUBST(readline_dir)
+AC_SUBST(extra_readline_dir)
AC_SUBST(readline_topdir)
AC_SUBST(readline_basedir)
AC_SUBST(readline_link)
@@ -2632,12 +2671,15 @@
# If we have threads generate some library functions and test programs
sql_server_dirs=
+extra_sql_server_dirs=
server_scripts=
thread_dirs=
+extra_thread_dirs=
dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs.
sql_client_dirs="libmysql client"
+extra_sql_client_dirs=""
linked_client_targets="linked_libmysql_sources"
CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS
if test "$THREAD_SAFE_CLIENT" != "no"
@@ -2645,12 +2687,15 @@
sql_client_dirs="libmysql_r $sql_client_dirs"
linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
AC_DEFINE(THREAD_SAFE_CLIENT)
+else
+ extra_sql_client_dirs="libmysql_r"
fi
CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"
AC_SUBST(CLIENT_LIBS)
AC_SUBST(sql_client_dirs)
+AC_SUBST(extra_sql_client_dirs)
AC_SUBST(linked_client_targets)
# If configuring for NetWare, set up to link sources from and build the
netware directory
@@ -2682,6 +2727,8 @@
if test X"$have_isam" != Xno
then
sql_server_dirs="$sql_server_dirs isam merge"
+ else
+ extra_sql_server_dirs="$extra_sql_server_dirs isam merge"
fi
if test X"$have_berkeley_db" != Xno; then
@@ -2721,6 +2768,8 @@
dnl echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
echo "END OF BERKELEY DB CONFIGURATION"
+ else
+ extra_sql_server_dirs="$extra_sql_server_dirs $have_berkeley_db"
fi
AC_DEFINE(HAVE_BERKELEY_DB)
@@ -2739,7 +2788,7 @@
header, even if we're not building with Berkeley DB.
Obviously, if this file *is* used, it'll break and hopefully we can find
-out why this file was generated by ${top_srcdir}/configure instead of
+out why this file was generated by ${ac_confdir}/configure instead of
the real db.h.
If you run into some problems because of this file, please use mysql_bug
@@ -2750,6 +2799,10 @@
EOF
fi
+ if test -d ${ac_confdir}/bdb
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs bdb"
+ fi
fi
if test X"$have_innodb" = Xyes
@@ -2775,6 +2828,11 @@
|| AC_MSG_ERROR([could not configure INNODB])
echo "END OF INNODB CONFIGURATION"
+ else
+ if test -d ${ac_confdir}/innobase
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs innobase"
+ fi
fi
#
# END of configuration for optional table handlers
@@ -2802,6 +2860,53 @@
echo "End of MIT Pthreads configuration"
echo ""
LIBS="$MT_LD_ADD $LIBS"
+ else
+ if test -d ${ac_confdir}/mit-pthreads
+ then
+ extra_thread_dirs="mit-pthreads"
+ fi
+ fi
+else
+ extra_sql_server_dirs="strings dbug mysys extra regex"
+ if test -d ${ac_confdir}/isam
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs isam"
+ fi
+ if test -d ${ac_confdir}/merge
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs merge"
+ fi
+ if test -d ${ac_confdir}/bdb
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs bdb"
+ fi
+ if test -d ${ac_confdir}/innobase
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs innobase"
+ fi
+ if test -d ${ac_confdir}/myisam
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs myisam"
+ fi
+ if test -d ${ac_confdir}/myisammmrg
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs myisammrg"
+ fi
+ if test -d ${ac_confdir}/heap
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs heap"
+ fi
+ if test -d ${ac_confdir}/vio
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs vio"
+ fi
+ if test -d ${ac_confdir}/sql
+ then
+ extra_sql_server_dirs="$extra_sql_server_dirs sql"
+ fi
+ if test -d ${ac_confdir}/mit-pthreads
+ then
+ extra_thread_dirs="mit-pthreads"
fi
fi
@@ -2813,7 +2918,9 @@
LIBS="$LIBS $STATIC_NSS_FLAGS"
AC_SUBST(sql_server_dirs)
+AC_SUBST(extra_sql_server_dirs)
AC_SUBST(thread_dirs)
+AC_SUBST(extra_thread_dirs)
AC_SUBST(server_scripts)
#if test "$with_posix_threads" = "no" -o "$with_mit_threads" = "yes"
--- 1.32/scripts/Makefile.am Wed Jun 25 00:34:21 2003
+++ 1.33/scripts/Makefile.am Thu Jun 26 14:23:00 2003
@@ -62,8 +62,7 @@
mysqlaccess.conf \
mysqlbug
-dist_pkgdata_DATA = fill_help_tables.sql
mysql_fix_privilege_tables.sql
-pkgdata_SCRIPTS = mysql_install_db
+pkgdata_SCRIPTS = mysql_install_db fill_help_tables.sql
mysql_fix_privilege_tables.sql
pkgscriptdir = $(pkgdatadir)/scripts
# mysqlbug should be distributed built so that people can report build
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx
|
