This patch removes need for a innodb to have its own configure. (fb47d658) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/FINISH.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -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\""

BUILD/autorun.sh

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

storage/innobase/Makefile.am

+11 −1

Original line number	Diff line number	Diff line
		@@ -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 \

storage/innobase/configure.in

deleted100644 → 0

+0 −156

Original line number	Diff line number	Diff line
		# 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)

storage/innobase/include/Makefile.i

+5 −1

Original line number	Diff line number	Diff line
		# 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.%