Skip to content

M
MariaDB
Commit faaeb49f authored by unknown's avatar unknown
Browse files
Options

make distcheck and cosmetic fixes

parent 56edd720
Expand all Show whitespace changes
Inline Side-by-side
Showing with 334 additions and 342 deletions
config/ac-macros/ha_berkeley.m4
View file @ faaeb49f
...@@ -8,23 +8,20 @@ dnl --------------------------------------------------------------------------- ...@@ -8,23 +8,20 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [ AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [
AC_ARG_WITH([berkeley-db], AC_ARG_WITH([berkeley-db],
[ AS_HELP_STRING([--with-berkeley-db[[[[[=DIR]]]]]],
--with-berkeley-db[=DIR] [Use BerkeleyDB located in DIR]),
Use BerkeleyDB located in DIR],
[bdb="$withval"], [bdb="$withval"],
[bdb=yes]) [bdb=yes])
AC_ARG_WITH([berkeley-db-includes], AC_ARG_WITH([berkeley-db-includes],
[ AS_HELP_STRING([--with-berkeley-db-includes=DIR],
--with-berkeley-db-includes=DIR [Find Berkeley DB headers in DIR]),
Find Berkeley DB headers in DIR],
[bdb_includes="$withval"], [bdb_includes="$withval"],
[bdb_includes=default]) [bdb_includes=default])
AC_ARG_WITH([berkeley-db-libs], AC_ARG_WITH([berkeley-db-libs],
[ AS_HELP_STRING([--with-berkeley-db-libs=DIR],
--with-berkeley-db-libs=DIR [Find Berkeley DB libraries in DIR]),
Find Berkeley DB libraries in DIR],
[bdb_libs="$withval"], [bdb_libs="$withval"],
[bdb_libs=default]) [bdb_libs=default])
......
config/ac-macros/ha_ndbcluster.m4
View file @ faaeb49f
...@@ -308,7 +308,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ ...@@ -308,7 +308,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
AC_SUBST(NDB_DEFS) AC_SUBST(NDB_DEFS)
AC_SUBST(ndb_cxxflags_fix) AC_SUBST(ndb_cxxflags_fix)
AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl AC_CONFIG_FILES(storage/ndb/include/Makefile dnl
storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
storage/ndb/docs/Makefile dnl storage/ndb/docs/Makefile dnl
storage/ndb/tools/Makefile dnl storage/ndb/tools/Makefile dnl
......
config/ac-macros/misc.m4
View file @ faaeb49f
...@@ -675,8 +675,8 @@ dnl Sets BIG_TABLES if --with-big-tables is used ...@@ -675,8 +675,8 @@ dnl Sets BIG_TABLES if --with-big-tables is used
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [ AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [
AC_ARG_WITH([big-tables], AC_ARG_WITH([big-tables],
[ AS_HELP_STRING([--with-big-tables],
--with-big-tables Support tables with more than 4 G rows even on 32 bit platforms], [Support tables with more than 4 G rows even on 32 bit platforms]),
[bigtables="$withval"], [bigtables="$withval"],
[bigtables=no]) [bigtables=no])
AC_MSG_CHECKING([for big tables support]) AC_MSG_CHECKING([for big tables support])
...@@ -703,8 +703,8 @@ dnl Sets MAX_INDEXES ...@@ -703,8 +703,8 @@ dnl Sets MAX_INDEXES
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [ AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [
AC_ARG_WITH([max-indexes], AC_ARG_WITH([max-indexes],
[ AS_HELP_STRING([--with-max-indexes=N],
--with-max-indexes=\# Sets the maximum number of indexes per table, default 64], [Sets the maximum number of indexes per table, default 64]),
[max_indexes="$withval"], [max_indexes="$withval"],
[max_indexes=64]) [max_indexes=64])
AC_MSG_CHECKING([max indexes per table]) AC_MSG_CHECKING([max indexes per table])
......
config/ac-macros/plugins.m4
View file @ faaeb49f
This diff is collapsed.
configure.in
View file @ faaeb49f
...@@ -104,7 +104,6 @@ MYSQL_MODULE_ACTIONS(innobase, [ ...@@ -104,7 +104,6 @@ MYSQL_MODULE_ACTIONS(innobase, [
AC_SUBST(innodb_includes) AC_SUBST(innodb_includes)
AC_SUBST(innodb_libs) AC_SUBST(innodb_libs)
AC_SUBST(innodb_system_libs) AC_SUBST(innodb_system_libs)
other_configures="$other_configures storage/innobase/configure"
]) ])
MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine], MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
...@@ -1712,7 +1711,7 @@ fi ...@@ -1712,7 +1711,7 @@ fi
# If we should allow error injection tests # If we should allow error injection tests
AC_ARG_WITH(error-inject, AC_ARG_WITH(error-inject,
[ --with-error-inject Enable error injection in MySQL Server], AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
[ with_error_inject=$withval ], [ with_error_inject=$withval ],
[ with_error_inject=no ]) [ with_error_inject=no ])
...@@ -2338,14 +2337,14 @@ fi ...@@ -2338,14 +2337,14 @@ fi
tools_dirs="" tools_dirs=""
AC_ARG_WITH([mysqlmanager], AC_ARG_WITH([mysqlmanager],
AC_HELP_STRING([--with-mysqlmanager], [Build the mysqlmanager binary: yes/no (default: build if server is built.)]), AC_HELP_STRING([--with-mysqlmanager], [Build the mysqlmanager binary: yes/no (default: build if server is built.)]),,)
[if test "x${withval}" != "xno"; then
tools_dirs="$tools_dirs server-tools" if test "$with_mysqlmanager" = "yes" -o \
fi], '(' "$with_mysqlmanager:$with_server" = ":yes" -a \
[if test "x${with_server}" = "xyes"; then -d "$srcdir/server-tools" ')' ; then
tools_dirs="$tools_dirs server-tools" tools_dirs="$tools_dirs server-tools"
fi] AC_CONFIG_FILES(server-tools/Makefile server-tools/instance-manager/Makefile)
) fi
AC_SUBST(tools_dirs) AC_SUBST(tools_dirs)
...@@ -2633,28 +2632,18 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) ...@@ -2633,28 +2632,18 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
# Output results # Output results
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
unittest/Makefile dnl unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
unittest/mytap/Makefile unittest/mytap/t/Makefile dnl
unittest/mysys/Makefile unittest/examples/Makefile dnl unittest/mysys/Makefile unittest/examples/Makefile dnl
strings/Makefile regex/Makefile dnl strings/Makefile regex/Makefile storage/Makefile dnl
storage/Makefile dnl
storage/archive/Makefile storage/bdb/Makefile storage/blackhole/Makefile dnl
storage/csv/Makefile storage/example/Makefile storage/heap/Makefile dnl
storage/myisam/Makefile storage/myisammrg/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl man/Makefile BUILD/Makefile vio/Makefile dnl
libmysql/Makefile client/Makefile dnl libmysql/Makefile client/Makefile dnl
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
sql/sql_builtin.cc sql-common/Makefile dnl sql/sql_builtin.cc sql-common/Makefile dnl
dbug/Makefile scripts/Makefile dnl dbug/Makefile scripts/Makefile include/Makefile dnl
include/Makefile dnl
server-tools/Makefile server-tools/instance-manager/Makefile dnl
tests/Makefile Docs/Makefile support-files/Makefile dnl tests/Makefile Docs/Makefile support-files/Makefile dnl
support-files/MacOSX/Makefile mysql-test/Makefile dnl support-files/MacOSX/Makefile mysql-test/Makefile dnl
mysql-test/ndb/Makefile netware/Makefile dnl mysql-test/ndb/Makefile netware/Makefile dnl
include/mysql_version.h dnl include/mysql_version.h plugin/Makefile win/Makefile)
plugin/Makefile dnl
plugin/fulltext/Makefile dnl
win/Makefile)
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
AC_OUTPUT AC_OUTPUT
......
plugin/Makefile.am
View file @ faaeb49f
...@@ -18,10 +18,8 @@ ...@@ -18,10 +18,8 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
# These are built from source in the Docs directory
EXTRA_DIST = fulltext/configure.in EXTRA_DIST = fulltext/configure.in
SUBDIRS = SUBDIRS = @mysql_pg_dirs@
DIST_SUBDIRS = . fulltext
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%
sql/Makefile.am
View file @ faaeb49f
...@@ -52,10 +52,10 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ ...@@ -52,10 +52,10 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \ ha_heap.h ha_myisam.h ha_myisammrg.h ha_partition.h \
ha_innodb.h ha_berkeley.h ha_federated.h \ ha_innodb.h ha_berkeley.h ha_federated.h \
ha_ndbcluster.h ha_ndbcluster_binlog.h \ ha_ndbcluster.h ha_ndbcluster_binlog.h \
ha_ndbcluster_tables.h ha_ndbcluster_tables.h \
opt_range.h protocol.h rpl_tblmap.h \ opt_range.h protocol.h rpl_tblmap.h \
log.h sql_show.h rpl_rli.h \ log.h sql_show.h rpl_rli.h \
sql_select.h structs.h table.h sql_udf.h hash_filo.h\ sql_select.h structs.h table.h sql_udf.h hash_filo.h \
lex.h lex_symbol.h sql_acl.h sql_crypt.h \ lex.h lex_symbol.h sql_acl.h sql_crypt.h \
log_event.h sql_repl.h slave.h rpl_filter.h \ log_event.h sql_repl.h slave.h rpl_filter.h \
rpl_injector.h \ rpl_injector.h \
......
storage/archive/Makefile.am
View file @ faaeb49f
...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
INCLUDES = -I$(top_srcdir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
-I$(srcdir) @ZLIB_INCLUDES@ -I$(srcdir) @ZLIB_INCLUDES@
...@@ -50,9 +50,9 @@ libarchive_a_SOURCES = ha_archive.cc azio.c ...@@ -50,9 +50,9 @@ libarchive_a_SOURCES = ha_archive.cc azio.c
archive_test_SOURCES = archive_test.c azio.c archive_test_SOURCES = archive_test.c azio.c
archive_test_CFLAGS = $(AM_CFLAGS) archive_test_CFLAGS = $(AM_CFLAGS)
archive_test_LDADD = $(top_srcdir)/mysys/libmysys.a \ archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \
$(top_srcdir)/dbug/libdbug.a \ $(top_builddir)/dbug/libdbug.a \
$(top_srcdir)/strings/libmystrings.a \ $(top_builddir)/strings/libmystrings.a \
@ZLIB_LIBS@ @ZLIB_LIBS@
archive_test_LDFLAGS = @NOINST_LDFLAGS@ archive_test_LDFLAGS = @NOINST_LDFLAGS@
......
storage/blackhole/Makefile.am
View file @ faaeb49f
...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
INCLUDES = -I$(top_srcdir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
-I$(srcdir) -I$(srcdir)
......
storage/example/Makefile.am
View file @ faaeb49f
...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir) ...@@ -20,7 +20,7 @@ MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir) MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix) MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir) MYSQLLIBdir= $(pkglibdir)
INCLUDES = -I$(top_srcdir)/include \ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \ -I$(top_srcdir)/sql \
-I$(srcdir) -I$(srcdir)
......
storage/innobase/Makefile.am
View file @ faaeb49f
...@@ -98,13 +98,12 @@ libinnobase.a: $(libinnobase_a_LIBADD) ...@@ -98,13 +98,12 @@ libinnobase.a: $(libinnobase_a_LIBADD)
-rm -f $@ -rm -f $@
if test "$(host_os)" = "netware" ; \ if test "$(host_os)" = "netware" ; \
then \ then \
$(libmysqld_a_AR) $@ $(libinnobase_a_LIBADD) ; \ $(libinnobase_a_AR) $@ $(libinnobase_a_LIBADD) ; \
else \ else \
(for arc in $(libinnobase_a_LIBADD); do \ for arc in $(libinnobase_a_LIBADD); do \
arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
$(AR) t $$arc|xargs -n 1 find $$arpath -name; \ $(AR) t $$arc|sed "s|^|$$arpath|"; \
$(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \ done | sort -u | xargs $(AR) cq $@ ; \
done ) | sort -u | xargs $(AR) cq $@ ; \
$(RANLIB) $@ ; \ $(RANLIB) $@ ; \
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7