diff options
| -rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
| -rwxr-xr-x | BUILD/autorun.sh | 4 | ||||
| -rw-r--r-- | storage/innobase/Makefile.am | 12 | ||||
| -rw-r--r-- | storage/innobase/configure.in | 156 | ||||
| -rw-r--r-- | storage/innobase/include/Makefile.i | 6 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/innobase/plug.in | 63 |
7 files changed, 80 insertions, 165 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 51f6e909172..b141a15068a 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs" commands="\ $make -k distclean || true -/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache; +/bin/rm -rf */.deps/*.P config.cache autom4te.cache; path=`dirname $0` . \"$path/autorun.sh\"" diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 337f43512fa..def229e21a0 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -11,10 +11,6 @@ if [ -f /usr/bin/glibtoolize ] LIBTOOLIZE=libtoolize fi -(cd storage/innobase && aclocal && autoheader && \ - $LIBTOOLIZE --automake --force --copy && \ - automake --force --add-missing --copy && autoconf) - aclocal || die "Can't execute aclocal" autoheader || die "Can't execute autoheader" # --force means overwrite ltmain.sh script if it already exists diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index 7884715d839..a68dbbcc2e6 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -17,10 +17,20 @@ # Process this file with automake to create Makefile.in +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/storage/innobase/include \ + -I$(top_srcdir)/sql \ + -I$(srcdir) + AUTOMAKE_OPTIONS = foreign TAR = gtar -noinst_HEADERS = ib_config.h +noinst_HEADERS = SUBDIRS = os ut btr buf data dict dyn eval fil fsp fut \ ha ibuf lock log mach mem mtr page \ diff --git a/storage/innobase/configure.in b/storage/innobase/configure.in deleted file mode 100644 index 4aaa28da89e..00000000000 --- a/storage/innobase/configure.in +++ /dev/null @@ -1,156 +0,0 @@ -# Process this file with autoconf to produce a configure script -AC_INIT -AC_CANONICAL_SYSTEM -AM_MAINTAINER_MODE -AM_CONFIG_HEADER(ib_config.h) -AM_INIT_AUTOMAKE(ib, 0.90) - -# This is need before AC_PROG_CC -# - -if test "x${CFLAGS-}" = x ; then - cflags_is_set=no -else - cflags_is_set=yes -fi - -if test "x${CPPFLAGS-}" = x ; then - cppflags_is_set=no -else - cppflags_is_set=yes -fi - -if test "x${LDFLAGS-}" = x ; then - ldflags_is_set=no -else - ldflags_is_set=yes -fi - -# The following hack should ensure that configure doesn't add optimizing -# or debugging flags to CFLAGS or CXXFLAGS -CFLAGS="$CFLAGS " -CXXFLAGS="$CXXFLAGS " - -AC_PROG_CC -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_PROG_LIBTOOL -AC_CHECK_HEADERS(aio.h sched.h) -AC_CHECK_SIZEOF(int, 4) -AC_CHECK_SIZEOF(long, 4) -AC_CHECK_SIZEOF(void*, 4) -AC_CHECK_FUNCS(sched_yield) -AC_CHECK_FUNCS(fdatasync) -AC_CHECK_FUNCS(localtime_r) -#AC_CHECK_FUNCS(readdir_r) MySQL checks that it has also the right args. -# Some versions of Unix only take 2 arguments. -#AC_C_INLINE Already checked in MySQL -AC_C_BIGENDIAN - -# Build optimized or debug version ? -# First check for gcc and g++ -if test "$ac_cv_prog_gcc" = "yes" -then - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="-O" - OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE" -else - DEBUG_CFLAGS="-g" - DEBUG_OPTIMIZE_CC="" - OPTIMIZE_CFLAGS="-O" -fi -if test "$ac_cv_prog_cxx_g" = "yes" -then - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="-O" - OPTIMIZE_CXXFLAGS="-O3" -else - DEBUG_CXXFLAGS="-g" - DEBUG_OPTIMIZE_CXX="" - OPTIMIZE_CXXFLAGS="-O" -fi -AC_ARG_WITH(debug, - [ --without-debug Build a production version without debugging code], - [with_debug=$withval], - [with_debug=no]) -if test "$with_debug" = "yes" -then - # Medium debug. - CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" -elif test "$with_debug" = "full" -then - # Full debug. Very slow in some cases - CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" - CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" -else - # Optimized version. No debug - CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS -DDEBUG_OFF" - CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS -DDEBUG_OFF" -fi - -# NOTE: The flags below are disabled by default since we can't easily get -# rid of the "string over 509 characters in length" warnings, and thus can't -# add -Werror. But it's a good idea to enable these for a test compile -# before shipping a new snapshot to MySQL to catch errors that could make -# the compile fail on non-C99 compilers. - -# If using gcc, disallow usage of C99 features to avoid accidentally -# introducing problems on compilers that only implement C89. -#if test "$ac_cv_prog_gcc" = "yes" -#then -# CFLAGS="$CFLAGS -std=c89 -ansi -pedantic -Wno-long-long" -#fi - -# If using gcc, add some extra warning flags. -if test "$ac_cv_prog_gcc" = "yes" -then - CFLAGS="$CFLAGS -Werror-implicit-function-declaration -Wpointer-arith" -fi - -case "$target_os" in - lin*) - CFLAGS="$CFLAGS -DUNIV_LINUX";; - hpux10*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";; - hp*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";; - aix*) - CFLAGS="$CFLAGS -DUNIV_AIX";; - irix*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; - osf*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; - sysv5uw7*) - # Problem when linking on SCO - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; - openbsd*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; -esac - -case "$target" in - i[[4567]]86-*-*) - CFLAGS="$CFLAGS -DUNIV_INTEL_X86";; - # The compiler on Linux/S390 does not seem to have inlining - s390-*-*) - CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; -esac - -# must go in pair with AR as set by MYSQL_CHECK_AR -if test -z "$ARFLAGS" -then - ARFLAGS="cru" -fi -AC_SUBST(ARFLAGS) - -AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl - buf/Makefile data/Makefile dnl - dict/Makefile dyn/Makefile dnl - eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl - ha/Makefile ibuf/Makefile dnl - lock/Makefile log/Makefile dnl - mach/Makefile mem/Makefile mtr/Makefile dnl - page/Makefile pars/Makefile que/Makefile dnl - read/Makefile rem/Makefile row/Makefile dnl - srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl - usr/Makefile) diff --git a/storage/innobase/include/Makefile.i b/storage/innobase/include/Makefile.i index 87952a7abc8..db436c702ff 100644 --- a/storage/innobase/include/Makefile.i +++ b/storage/innobase/include/Makefile.i @@ -1,6 +1,10 @@ # Makefile included in Makefile.am in every subdirectory -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/../../include +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/storage/innobase/include \ + -I$(top_srcdir)/sql \ + -I$(srcdir) # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index f2dafbc3a70..c1f028ef4a3 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -41,7 +41,7 @@ if we are compiling on Windows. */ /* Include the header file generated by GNU autoconf */ #ifndef __WIN__ -#include "../ib_config.h" +#include "config.h" #endif #ifdef HAVE_SCHED_H diff --git a/storage/innobase/plug.in b/storage/innobase/plug.in index b3a90c5a98f..fc1d758fd87 100644 --- a/storage/innobase/plug.in +++ b/storage/innobase/plug.in @@ -5,5 +5,66 @@ MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a]) MYSQL_PLUGIN_ACTIONS(innobase, [ AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"]) AC_SUBST(innodb_system_libs) -]) + AC_PROG_CC + AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_CHECK_HEADERS(aio.h sched.h) + AC_CHECK_SIZEOF(int, 4) + AC_CHECK_SIZEOF(long, 4) + AC_CHECK_SIZEOF(void*, 4) + AC_CHECK_FUNCS(sched_yield) + AC_CHECK_FUNCS(fdatasync) + AC_CHECK_FUNCS(localtime_r) + AC_C_BIGENDIAN + case "$target_os" in + lin*) + CFLAGS="$CFLAGS -DUNIV_LINUX";; + hpux10*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";; + hp*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";; + aix*) + CFLAGS="$CFLAGS -DUNIV_AIX";; + irix*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + osf*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + sysv5uw7*) + # Problem when linking on SCO + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + openbsd*) + CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";; + esac + AC_CONFIG_FILES( + storage/innobase/ut/Makefile + storage/innobase/btr/Makefile + storage/innobase/buf/Makefile + storage/innobase/data/Makefile + storage/innobase/dict/Makefile + storage/innobase/dyn/Makefile + storage/innobase/eval/Makefile + storage/innobase/fil/Makefile + storage/innobase/fsp/Makefile + storage/innobase/fut/Makefile + storage/innobase/ha/Makefile + storage/innobase/ibuf/Makefile + storage/innobase/lock/Makefile + storage/innobase/log/Makefile + storage/innobase/mach/Makefile + storage/innobase/mem/Makefile + storage/innobase/mtr/Makefile + storage/innobase/os/Makefile + storage/innobase/page/Makefile + storage/innobase/pars/Makefile + storage/innobase/que/Makefile + storage/innobase/read/Makefile + storage/innobase/rem/Makefile + storage/innobase/row/Makefile + storage/innobase/srv/Makefile + storage/innobase/sync/Makefile + storage/innobase/thr/Makefile + storage/innobase/trx/Makefile + storage/innobase/usr/Makefile) + ]) |