Commit 2eff96e6 authored by unknown's avatar unknown
Browse files

make distcheck and cosmetic fixes

parent f00d16a3

config/ac-macros/ha_berkeley.m4

+6 −9
Original line number Diff line number Diff line
@@ -8,23 +8,20 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_SETUP_BERKELEY_DB], [

  AC_ARG_WITH([berkeley-db],

              [

  --with-berkeley-db[=DIR]

                          Use BerkeleyDB located in DIR],

              AS_HELP_STRING([--with-berkeley-db[[[[[=DIR]]]]]],

                             [Use BerkeleyDB located in DIR]),

              [bdb="$withval"],

              [bdb=yes])



  AC_ARG_WITH([berkeley-db-includes],

              [

  --with-berkeley-db-includes=DIR

                          Find Berkeley DB headers in DIR],

              AS_HELP_STRING([--with-berkeley-db-includes=DIR],

                             [Find Berkeley DB headers in DIR]),

              [bdb_includes="$withval"],

              [bdb_includes=default])



  AC_ARG_WITH([berkeley-db-libs],

              [

  --with-berkeley-db-libs=DIR

                          Find Berkeley DB libraries in DIR],

              AS_HELP_STRING([--with-berkeley-db-libs=DIR],

                             [Find Berkeley DB libraries in DIR]),

              [bdb_libs="$withval"],

              [bdb_libs=default])

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 
  AC_SUBST(NDB_DEFS)

  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/docs/Makefile dnl

   storage/ndb/tools/Makefile dnl

config/ac-macros/misc.m4

+4 −4
Original line number Diff line number Diff line
@@ -675,8 +675,8 @@ dnl Sets BIG_TABLES if --with-big-tables is used 
dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [

  AC_ARG_WITH([big-tables],

              [

  --with-big-tables       Support tables with more than 4 G rows even on 32 bit platforms],

  AS_HELP_STRING([--with-big-tables],

              [Support tables with more than 4 G rows even on 32 bit platforms]),

              [bigtables="$withval"],

              [bigtables=no])

  AC_MSG_CHECKING([for big tables support])
@@ -703,8 +703,8 @@ dnl Sets MAX_INDEXES 
dnl ---------------------------------------------------------------------------

AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [

  AC_ARG_WITH([max-indexes],

              [

  --with-max-indexes=\#      Sets the maximum number of indexes per table, default 64],

              AS_HELP_STRING([--with-max-indexes=N],

                             [Sets the maximum number of indexes per table, default 64]),

              [max_indexes="$withval"],

              [max_indexes=64])

  AC_MSG_CHECKING([max indexes per table])

config/ac-macros/plugins.m4

+296 −287

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+13 −24
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ MYSQL_MODULE_ACTIONS(innobase, [ 
  AC_SUBST(innodb_includes)

  AC_SUBST(innodb_libs)

  AC_SUBST(innodb_system_libs)

  other_configures="$other_configures storage/innobase/configure"

])



MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
@@ -1712,7 +1711,7 @@ fi 


# If we should allow error injection tests

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=no ])
@@ -2338,14 +2337,14 @@ fi 
tools_dirs=""



AC_ARG_WITH([mysqlmanager],

  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"

   fi],

  [if test "x${with_server}" = "xyes"; then

  AC_HELP_STRING([--with-mysqlmanager], [Build the mysqlmanager binary: yes/no (default: build if server is built.)]),,)



if test "$with_mysqlmanager" = "yes" -o \

        '(' "$with_mysqlmanager:$with_server" = ":yes" -a \

            -d "$srcdir/server-tools" ')' ; then

  tools_dirs="$tools_dirs server-tools"

   fi]

)

  AC_CONFIG_FILES(server-tools/Makefile server-tools/instance-manager/Makefile)

fi



AC_SUBST(tools_dirs)
@@ -2633,28 +2632,18 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS) 


# Output results

AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl

 unittest/Makefile dnl

 unittest/mytap/Makefile unittest/mytap/t/Makefile dnl

 unittest/Makefile unittest/mytap/Makefile unittest/mytap/t/Makefile dnl

 unittest/mysys/Makefile unittest/examples/Makefile dnl

 strings/Makefile regex/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

 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

 sql/sql_builtin.cc sql-common/Makefile dnl

 dbug/Makefile scripts/Makefile dnl

 include/Makefile dnl

 server-tools/Makefile server-tools/instance-manager/Makefile dnl

 dbug/Makefile scripts/Makefile include/Makefile dnl

 tests/Makefile Docs/Makefile support-files/Makefile dnl

 support-files/MacOSX/Makefile mysql-test/Makefile dnl

 mysql-test/ndb/Makefile netware/Makefile dnl

 include/mysql_version.h dnl

 plugin/Makefile dnl

 plugin/fulltext/Makefile dnl

 win/Makefile)

 include/mysql_version.h plugin/Makefile win/Makefile)

 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)

 AC_OUTPUT