#At file:///home/sketch/bzr/mysql-6.0-build/ based on revid:jperkin@stripped
2807 Jonathan Perkin 2009-01-12 [merge]
Merge
modified:
BUILD/Makefile.am
Docs/Makefile.am
Makefile.am
client/Makefile.am
cmd-line-utils/Makefile.am
cmd-line-utils/libedit/Makefile.am
cmd-line-utils/readline/Makefile.am
config/ac-macros/alloca.m4
config/ac-macros/check_cpu.m4
config/ac-macros/compiler_flag.m4
config/ac-macros/ha_ndbcluster.m4
config/ac-macros/large_file.m4
config/ac-macros/libevent_configure.m4
config/ac-macros/misc.m4
config/ac-macros/readline.m4
config/ac-macros/ssl.m4
config/ac-macros/zlib.m4
configure.in
dbug/Makefile.am
extra/Makefile.am
extra/libevent/Makefile.am
extra/yassl/Makefile.am
extra/yassl/src/Makefile.am
extra/yassl/taocrypt/Makefile.am
extra/yassl/taocrypt/benchmark/Makefile.am
extra/yassl/taocrypt/src/Makefile.am
extra/yassl/taocrypt/test/Makefile.am
extra/yassl/testsuite/Makefile.am
include/Makefile.am
include/config-win.h
include/my_global.h
libmysql/Makefile.am
libmysql_r/Makefile.am
libmysqld/Makefile.am
libmysqld/examples/Makefile.am
man/Makefile.am
mysql-test/Makefile.am
mysql-test/ndb/Makefile.am
mysys/Makefile.am
mysys/tests/Makefile.am
netware/Makefile.am
plugin/Makefile.am
plugin/audit_null/Makefile.am
plugin/daemon_example/Makefile.am
plugin/fulltext/Makefile.am
pstack/Makefile.am
pstack/aout/Makefile.am
regex/Makefile.am
scripts/Makefile.am
sql-bench/Makefile.am
sql-common/Makefile.am
sql/Makefile.am
sql/backup/Makefile.am
sql/share/Makefile.am
storage/Makefile.am
storage/archive/Makefile.am
storage/blackhole/Makefile.am
storage/csv/Makefile.am
storage/example/Makefile.am
storage/falcon/Makefile.am
storage/falcon/TransformLib/Makefile.am
storage/falcon/plug.in
storage/federated/Makefile.am
storage/heap/Makefile.am
storage/innobase/Makefile.am
storage/maria/Makefile.am
storage/maria/plug.in
storage/maria/unittest/Makefile.am
storage/myisam/Makefile.am
storage/myisammrg/Makefile.am
storage/ndb/Makefile.am
storage/ndb/config/common.mk.am
storage/ndb/config/type_kernel.mk.am
storage/ndb/config/type_mgmapiclient.mk.am
storage/ndb/config/type_ndbapi.mk.am
storage/ndb/config/type_ndbapiclient.mk.am
storage/ndb/config/type_ndbapitest.mk.am
storage/ndb/config/type_ndbapitools.mk.am
storage/ndb/config/type_util.mk.am
storage/ndb/docs/Makefile.am
storage/ndb/include/Makefile.am
storage/ndb/src/Makefile.am
storage/ndb/src/common/Makefile.am
storage/ndb/src/common/debugger/Makefile.am
storage/ndb/src/common/debugger/signaldata/Makefile.am
storage/ndb/src/common/logger/Makefile.am
storage/ndb/src/common/mgmcommon/Makefile.am
storage/ndb/src/common/portlib/Makefile.am
storage/ndb/src/common/transporter/Makefile.am
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/common/util/Makefile.am
storage/ndb/src/cw/Makefile.am
storage/ndb/src/cw/cpcd/Makefile.am
storage/ndb/src/kernel/Makefile.am
storage/ndb/src/kernel/blocks/Makefile.am
storage/ndb/src/kernel/blocks/backup/Makefile.am
storage/ndb/src/kernel/blocks/dbdict/Makefile.am
storage/ndb/src/kernel/blocks/dbdih/Makefile.am
storage/ndb/src/kernel/blocks/dblqh/Makefile.am
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
storage/ndb/src/kernel/error/Makefile.am
storage/ndb/src/kernel/vm/Makefile.am
storage/ndb/src/mgmapi/Makefile.am
storage/ndb/src/mgmclient/Makefile.am
storage/ndb/src/mgmsrv/Makefile.am
storage/ndb/src/ndbapi/Makefile.am
storage/ndb/swig/Makefile.am
storage/ndb/test/Makefile.am
storage/ndb/test/ndbapi/Makefile.am
storage/ndb/test/ndbapi/bank/Makefile.am
storage/ndb/test/run-test/Makefile.am
storage/ndb/test/src/Makefile.am
storage/ndb/test/tools/Makefile.am
storage/ndb/tools/Makefile.am
strings/Makefile.am
support-files/MacOSX/Makefile.am
support-files/Makefile.am
support-files/RHEL4-SElinux/Makefile.am
tests/Makefile.am
unittest/Makefile.am
unittest/examples/Makefile.am
unittest/mysys/Makefile.am
unittest/mytap/Makefile.am
unittest/mytap/t/Makefile.am
vio/Makefile.am
win/Makefile.am
zlib/Makefile.am
=== modified file 'BUILD/Makefile.am'
=== modified file 'BUILD/Makefile.am'
--- a/BUILD/Makefile.am 2008-05-13 13:58:07 +0000
+++ b/BUILD/Makefile.am 2009-01-07 10:58:33 +0000
@@ -84,6 +84,3 @@
compile-sparc \
compile-sparc-debug \
compile-sparc-debug-max-no-ndb
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'Docs/Makefile.am'
--- a/Docs/Makefile.am 2008-04-08 09:44:18 +0000
+++ b/Docs/Makefile.am 2009-01-07 10:58:33 +0000
@@ -37,6 +37,3 @@
@RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
@RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
fi
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-12-17 18:40:14 +0000
+++ b/Makefile.am 2009-01-07 10:58:33 +0000
@@ -53,10 +53,8 @@
bin-dist: all
$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
-# Remove BK's "SCCS" subdirectories from source distribution
# Create initial database files for Windows installations and check them.
dist-hook:
- rm -rf `find $(distdir) -type d -name SCCS -print`
mkdir -p $(distdir)/win
scripts/mysql_install_db --no-defaults --cross-bootstrap \
--builddir=$(top_builddir) \
@@ -336,6 +334,3 @@
@DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
@RM@ $(top_builddir)/abi_check.out; \
done
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'client/Makefile.am'
--- a/client/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/client/Makefile.am 2009-01-07 10:58:33 +0000
@@ -21,8 +21,7 @@
LIBMYSQLCLIENT_LA = $(top_builddir)/libmysql/libmysqlclient.la
endif
-INCLUDES = -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
$(openssl_includes)
@@ -124,6 +123,3 @@
rm -f $(srcdir)/my_user.c; \
@LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
echo timestamp > link_sources;
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'cmd-line-utils/Makefile.am'
--- a/cmd-line-utils/Makefile.am 2006-12-23 19:17:15 +0000
+++ b/cmd-line-utils/Makefile.am 2009-01-07 10:58:33 +0000
@@ -19,6 +19,3 @@
SUBDIRS= @readline_basedir@
DIST_SUBDIRS= libedit readline
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'cmd-line-utils/libedit/Makefile.am'
--- a/cmd-line-utils/libedit/Makefile.am 2007-10-31 09:52:18 +0000
+++ b/cmd-line-utils/libedit/Makefile.am 2009-01-07 10:58:33 +0000
@@ -5,7 +5,7 @@
ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
AHDR = vi.h emacs.h common.h
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libedit.a
@@ -101,6 +101,3 @@
tty.o: vi.h emacs.h common.h help.h fcns.h
help.o: vi.h emacs.h common.h help.h fcns.h
fcns.o: vi.h emacs.h common.h help.h fcns.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'cmd-line-utils/readline/Makefile.am'
--- a/cmd-line-utils/readline/Makefile.am 2007-09-26 18:19:33 +0000
+++ b/cmd-line-utils/readline/Makefile.am 2009-01-07 10:58:33 +0000
@@ -3,8 +3,7 @@
# Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
# Last -I$(top_srcdir) needed for RedHat!
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libreadline.a
@@ -32,6 +31,3 @@
EXTRA_DIST= emacs_keymap.c vi_keymap.c
DEFS = -DUNDEF_THREADS_HACK -DHAVE_CONFIG_H -DNO_KILL_INTR
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'config/ac-macros/alloca.m4'
--- a/config/ac-macros/alloca.m4 2004-12-04 19:00:33 +0000
+++ b/config/ac-macros/alloca.m4 2009-01-09 11:46:26 +0000
@@ -8,15 +8,21 @@
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
AC_CACHE_CHECK([for working alloca.h], ac_cv_header_alloca_h,
- [AC_TRY_LINK([#include <alloca.h>], [char *p = alloca(2 * sizeof(int));],
- ac_cv_header_alloca_h=yes, ac_cv_header_alloca_h=no)])
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#include <alloca.h>]], [[char *p = alloca(2 * sizeof(int));]])],
+ [ac_cv_header_alloca_h=yes],
+ [ac_cv_header_alloca_h=no]
+ )]
+ )
if test "$ac_cv_header_alloca_h" = "yes"
then
AC_DEFINE(HAVE_ALLOCA, 1)
fi
AC_CACHE_CHECK([for alloca], ac_cv_func_alloca_works,
- [AC_TRY_LINK([
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#ifdef __GNUC__
# define alloca __builtin_alloca
#else
@@ -32,8 +38,15 @@
# endif
# endif
#endif
- ], [char *p = (char *) alloca(1);],
- ac_cv_func_alloca_works=yes, ac_cv_func_alloca_works=no)])
+ ]],
+ [[
+ char *p = (char *) alloca(1);
+ ]]
+ )],
+ [ac_cv_func_alloca_works=yes],
+ [ac_cv_func_alloca_works=no]
+ )]
+ )
if test "$ac_cv_func_alloca_works" = "yes"; then
AC_DEFINE([HAVE_ALLOCA], [1], [If we have a working alloca() implementation])
fi
=== modified file 'config/ac-macros/check_cpu.m4'
--- a/config/ac-macros/check_cpu.m4 2004-12-04 19:00:33 +0000
+++ b/config/ac-macros/check_cpu.m4 2009-01-09 11:46:26 +0000
@@ -33,7 +33,9 @@
for ac_arg in $cpu_set;
do
CFLAGS="$ac_save_CFLAGS -mcpu=$ac_arg -march=$ac_arg -DCPU=$ac_arg"
- AC_TRY_COMPILE([],[int i],mysql_cv_cpu=$ac_arg; break;, mysql_cv_cpu="unknown")
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[[int i]])],
+ [mysql_cv_cpu=$ac_arg; break;],
+ [mysql_cv_cpu="unknown"])
done
if test "$mysql_cv_cpu" = "unknown"
=== modified file 'config/ac-macros/compiler_flag.m4'
--- a/config/ac-macros/compiler_flag.m4 2007-05-27 21:21:03 +0000
+++ b/config/ac-macros/compiler_flag.m4 2009-01-09 11:46:26 +0000
@@ -7,7 +7,11 @@
AC_CACHE_VAL(mysql_cv_option_$2,
[
CFLAGS="[$]OLD_CFLAGS $1"
- AC_TRY_LINK([int main(){exit(0);}],mysql_cv_option_$2=yes,mysql_cv_option_$2=no,mysql_cv_option_$2=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([], [[exit(0);]])],
+ [mysql_cv_option_$2=yes],
+ [mysql_cv_option_$2=no],
+ [mysql_cv_option_$2=no])
])
CFLAGS="[$]OLD_CFLAGS"
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4 2008-12-17 18:40:14 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4 2009-01-09 11:46:26 +0000
@@ -21,7 +21,7 @@
AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
AC_ARG_WITH([ndb-sci],
- AC_HELP_STRING([--with-ndb-sci=DIR],
+ AS_HELP_STRING([--with-ndb-sci=DIR],
[Provide MySQL with a custom location of
sci library. Given DIR, sci library is
assumed to be in $DIR/lib and header files
@@ -53,37 +53,37 @@
esac
AC_ARG_WITH([ndb-test],
- [AC_HELP_STRING([--with-ndb-test],
+ [AS_HELP_STRING([--with-ndb-test],
[Include the NDB Cluster ndbapi test programs])],
[ndb_test="$withval"],
[ndb_test=no])
AC_ARG_WITH([ndb-docs],
- [AC_HELP_STRING([--with-ndb-docs],
+ [AS_HELP_STRING([--with-ndb-docs],
[Include the NDB Cluster ndbapi and mgmapi documentation])],
[ndb_docs="$withval"],
[ndb_docs=no])
AC_ARG_WITH([ndb-port],
- [AC_HELP_STRING([--with-ndb-port],
+ [AS_HELP_STRING([--with-ndb-port],
[Port for NDB Cluster management server])],
[ndb_port="$withval"],
[ndb_port="default"])
AC_ARG_WITH([ndb-port-base],
- [AC_HELP_STRING([--with-ndb-port-base],
+ [AS_HELP_STRING([--with-ndb-port-base],
[Base port for NDB Cluster transporters])],
[ndb_port_base="$withval"],
[ndb_port_base="default"])
AC_ARG_WITH([ndb-debug],
- [AC_HELP_STRING([--without-ndb-debug],
+ [AS_HELP_STRING([--without-ndb-debug],
[Disable special ndb debug features])],
[ndb_debug="$withval"],
[ndb_debug="default"])
AC_ARG_WITH([ndb-ccflags],
- [AC_HELP_STRING([--with-ndb-ccflags=CFLAGS],
+ [AS_HELP_STRING([--with-ndb-ccflags=CFLAGS],
[Extra CFLAGS for ndb compile])],
[ndb_ccflags=${withval}],
[ndb_ccflags=""])
AC_ARG_WITH([ndb-binlog],
- [AC_HELP_STRING([--without-ndb-binlog],
+ [AS_HELP_STRING([--without-ndb-binlog],
[Disable ndb binlog])],
[ndb_binlog="$withval"],
[ndb_binlog="default"])
@@ -145,9 +145,14 @@
])
AC_DEFUN([NDBCLUSTER_WORKAROUNDS], [
+ AC_REQUIRE([AC_PROG_CC]) dnl Make sure $GCC is set if GNU C
+ if test "$GCC" != "yes"
+ then
+ GCC=no # Doc doesn't say what set to if not "yes"
+ fi
#workaround for Sun Forte/x86 see BUG#4681
- case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc in
+ case $SYSTEM_TYPE-$MACHINE_TYPE-$GCC in
*solaris*-i?86-no)
CFLAGS="$CFLAGS -DBIG_TABLES"
CXXFLAGS="$CXXFLAGS -DBIG_TABLES"
@@ -157,7 +162,7 @@
esac
# workaround for Sun Forte compile problem for ndb
- case $SYSTEM_TYPE-$ac_cv_prog_gcc in
+ case $SYSTEM_TYPE-$GCC in
*solaris*-no)
ndb_cxxflags_fix="$ndb_cxxflags_fix -instances=static"
;;
@@ -167,7 +172,7 @@
# ndb fail for whatever strange reason to link Sun Forte/x86
# unless using incremental linker
- case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
+ case $SYSTEM_TYPE-$MACHINE_TYPE-$GCC-$have_ndbcluster in
*solaris*-i?86-no-yes)
CXXFLAGS="$CXXFLAGS -xildon"
;;
=== modified file 'config/ac-macros/large_file.m4'
--- a/config/ac-macros/large_file.m4 2007-10-12 10:03:51 +0000
+++ b/config/ac-macros/large_file.m4 2009-01-09 11:46:26 +0000
@@ -8,8 +8,9 @@
dnl Internal subroutine of AC_SYS_LARGEFILE.
dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME)
-AC_DEFUN([AC_SYS_LARGEFILE_FLAGS],
- [AC_CACHE_CHECK([for $1 value to request large file support],
+AC_DEFUN([AC_SYS_LARGEFILE_FLAGS], [
+ AC_REQUIRE([AC_PROG_CC]) dnl Make sure $GCC is set if GNU C
+ AC_CACHE_CHECK([for $1 value to request large file support],
ac_cv_sys_largefile_$1,
[if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2
then
@@ -39,7 +40,10 @@
if test "$ac_cv_sys_largefile_CFLAGS" != no; then
ac_save_CC="$CC"
CC="$CC $ac_cv_sys_largefile_CFLAGS"
- AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([],[])],
+ [],
+ [ac_cv_sys_largefile_CFLAGS=no])
CC="$ac_save_CC"
fi])
fi
=== modified file 'config/ac-macros/libevent_configure.m4'
--- a/config/ac-macros/libevent_configure.m4 2008-04-29 18:53:07 +0000
+++ b/config/ac-macros/libevent_configure.m4 2009-01-09 11:46:26 +0000
@@ -18,7 +18,7 @@
], [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_TAILQFOREACH, 1,
[Define if TAILQ_FOREACH is defined in <sys/queue.h>])],
- AC_MSG_RESULT(no)
+ [AC_MSG_RESULT(no)]
)
fi
@@ -32,7 +32,8 @@
#endif
], [ AC_DEFINE(HAVE_TIMERADD, 1,
[Define if timeradd is defined in <sys/time.h>])
- AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
)
fi
@@ -46,7 +47,8 @@
#endif
], [ AC_DEFINE(HAVE_TIMERCMP, 1,
[Define if timercmp is defined in <sys/time.h>])
- AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
)
fi
@@ -60,7 +62,8 @@
#endif
], [ AC_DEFINE(HAVE_TIMERCLEAR, 1,
[Define if timerclear is defined in <sys/time.h>])
- AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
)
fi
@@ -74,7 +77,8 @@
#endif
], [ AC_DEFINE(HAVE_TIMERISSET, 1,
[Define if timerisset is defined in <sys/time.h>])
- AC_MSG_RESULT(yes)] ,AC_MSG_RESULT(no)
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
)
fi
@@ -104,25 +108,27 @@
#endif
], [ AC_DEFINE(HAVE_SETFD, 1,
[Define if F_SETFD is defined in <fcntl.h>])
- AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))
+ AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)]
+ )
needsignal=no
haveselect=no
-AC_CHECK_FUNCS(select, [haveselect=yes], )
+AC_CHECK_FUNCS(select, [haveselect=yes])
if test "x$haveselect" = "xyes" ; then
AC_LIBOBJ(select)
needsignal=yes
fi
havepoll=no
-AC_CHECK_FUNCS(poll, [havepoll=yes], )
+AC_CHECK_FUNCS(poll, [havepoll=yes])
if test "x$havepoll" = "xyes" ; then
AC_LIBOBJ(poll)
needsignal=yes
fi
haveepoll=no
-AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
+AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes])
if test "x$haveepoll" = "xyes" ; then
AC_DEFINE(HAVE_EPOLL, 1,
[Define if your system supports the epoll system calls])
@@ -139,46 +145,46 @@
havekqueue=no
if test "x$ac_cv_header_sys_event_h" = "xyes"; then
- AC_CHECK_FUNCS(kqueue, [havekqueue=yes], )
+ AC_CHECK_FUNCS(kqueue, [havekqueue=yes])
if test "x$havekqueue" = "xyes" ; then
AC_MSG_CHECKING(for working kqueue)
- AC_TRY_RUN(
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <sys/types.h>
#include <sys/time.h>
#include <sys/event.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
-
-int
-main(int argc, char **argv)
-{
+ ]],
+ [[
int kq;
int n;
- int fd[[2]];
+ int fd[2];
struct kevent ev;
struct timespec ts;
- char buf[[8000]];
+ char buf[8000];
if (pipe(fd) == -1)
exit(1);
- if (fcntl(fd[[1]], F_SETFL, O_NONBLOCK) == -1)
+ if (fcntl(fd[1], F_SETFL, O_NONBLOCK) == -1)
exit(1);
- while ((n = write(fd[[1]], buf, sizeof(buf))) == sizeof(buf))
+ while ((n = write(fd[1], buf, sizeof(buf))) == sizeof(buf))
;
if ((kq = kqueue()) == -1)
exit(1);
- ev.ident = fd[[1]];
+ ev.ident = fd[1];
ev.filter = EVFILT_WRITE;
ev.flags = EV_ADD | EV_ENABLE;
n = kevent(kq, &ev, 1, NULL, 0, NULL);
if (n == -1)
exit(1);
- read(fd[[0]], buf, sizeof(buf));
+ read(fd[0], buf, sizeof(buf));
ts.tv_sec = 0;
ts.tv_nsec = 0;
@@ -187,10 +193,15 @@
exit(1);
exit(0);
-}, [AC_MSG_RESULT(yes)
+ ]]
+ )],
+ [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_WORKING_KQUEUE, 1,
[Define if kqueue works correctly with pipes])
- AC_LIBOBJ(kqueue)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
+ AC_LIBOBJ(kqueue)],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(no)]
+ )
fi
fi
@@ -198,7 +209,9 @@
if test "x$ac_cv_header_sys_epoll_h" = "xyes"; then
if test "x$haveepoll" = "xno" ; then
AC_MSG_CHECKING(for epoll system call)
- AC_TRY_RUN(
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <stdint.h>
#include <sys/param.h>
#include <sys/types.h>
@@ -211,25 +224,28 @@
{
return (syscall(__NR_epoll_create, size));
}
-
-int
-main(int argc, char **argv)
-{
+ ]],
+ [[
int epfd;
epfd = epoll_create(256);
exit (epfd == -1 ? 1 : 0);
-}, [AC_MSG_RESULT(yes)
+ ]]
+ )],
+ [AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_EPOLL, 1,
[Define if your system supports the epoll system calls])
needsignal=yes
AC_LIBOBJ(epoll_sub)
- AC_LIBOBJ(epoll)], AC_MSG_RESULT(no), AC_MSG_RESULT(no))
+ AC_LIBOBJ(epoll)],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(no)]
+ )
fi
fi
haveeventports=no
-AC_CHECK_FUNCS(port_create, [haveeventports=yes], )
+AC_CHECK_FUNCS(port_create, [haveeventports=yes])
if test "x$haveeventports" = "xyes" ; then
AC_DEFINE(HAVE_EVENT_PORTS, 1,
[Define if your system supports event ports])
@@ -248,21 +264,21 @@
AC_TYPE_PID_T
AC_TYPE_SIZE_T
-AC_CHECK_TYPES([uint64_t, uint32_t, uint16_t, uint8_t], , ,
-[#ifdef HAVE_STDINT_H
+AC_CHECK_TYPES([uint64_t, uint32_t, uint16_t, uint8_t],[],[],
+[[#ifdef HAVE_STDINT_H
#include <stdint.h>
#elif defined(HAVE_INTTYPES_H)
#include <inttypes.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
-#endif])
+#endif]])
AC_CHECK_SIZEOF(long long)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(short)
-AC_CHECK_TYPES([struct in6_addr], , ,
-[#ifdef WIN32
+AC_CHECK_TYPES([struct in6_addr],[],[],
+[[#ifdef WIN32
#include <winsock2.h>
#else
#include <sys/types.h>
@@ -271,30 +287,38 @@
#endif
#ifdef HAVE_NETINET_IN6_H
#include <netinet/in6.h>
-#endif])
+#endif]])
AC_MSG_CHECKING([for socklen_t])
-AC_TRY_COMPILE([
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <sys/types.h>
- #include <sys/socket.h>],
- [socklen_t x;],
- AC_MSG_RESULT([yes]),
+ #include <sys/socket.h>
+ ]],
+ [[
+ socklen_t x;
+ ]]
+ )],
+ [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])
AC_DEFINE(socklen_t, unsigned int,
[Define to unsigned int if you dont have it])]
)
AC_MSG_CHECKING([whether our compiler supports __func__])
-AC_TRY_COMPILE([],
- [ const char *cp = __func__; ],
- AC_MSG_RESULT([yes]),
- AC_MSG_RESULT([no])
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([],[[const char *cp = __func__;]])],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
AC_MSG_CHECKING([whether our compiler supports __FUNCTION__])
- AC_TRY_COMPILE([],
- [ const char *cp = __FUNCTION__; ],
- AC_MSG_RESULT([yes])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([],[[const char *cp = __FUNCTION__;]])],
+ [AC_MSG_RESULT([yes])
AC_DEFINE(__func__, __FUNCTION__,
- [Define to appropriate substitue if compiler doesnt have __func__]),
- AC_MSG_RESULT([no])
+ [Define to appropriate substitue if compiler doesnt have __func__])],
+ [AC_MSG_RESULT([no])
AC_DEFINE(__func__, __FILE__,
- [Define to appropriate substitue if compiler doesnt have __func__])))
+ [Define to appropriate substitue if compiler doesnt have __func__])]
+ )]
+)
=== modified file 'config/ac-macros/misc.m4'
--- a/config/ac-macros/misc.m4 2008-11-26 16:25:23 +0000
+++ b/config/ac-macros/misc.m4 2009-01-09 11:46:26 +0000
@@ -1,40 +1,57 @@
# Local macros for automake & autoconf
#---START: Used in for client configure
-AC_DEFUN([MYSQL_TYPE_ACCEPT],
-[ac_save_CXXFLAGS="$CXXFLAGS"
+AC_DEFUN([MYSQL_TYPE_ACCEPT], [
+ AC_REQUIRE([AC_PROG_CXX]) dnl Make sure $GXX is set if GNU C++
+ ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
-AC_LANG_PUSH(C++)
-if test "$ac_cv_prog_gxx" = "yes"
+ AC_LANG_PUSH([C++])
+ if test "$GXX" = "yes"
then
# Add -Werror, remove -fbranch-probabilities (Bug #268)
CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
fi
mysql_cv_btype_last_arg_accept=none
-[AC_TRY_COMPILE([#if defined(inline)
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if defined(inline)
#undef inline
#endif
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
-],
-[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
-mysql_cv_btype_last_arg_accept=socklen_t)]
+ ]],
+ [[
+ int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);
+ ]]
+ )],
+ [mysql_cv_btype_last_arg_accept=socklen_t]
+ )]
+
if test "$mysql_cv_btype_last_arg_accept" = "none"; then
-[AC_TRY_COMPILE([#if defined(inline)
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if defined(inline)
#undef inline
#endif
#include <stdlib.h>
#include <sys/types.h>
#include <sys/socket.h>
-],
-[int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0);],
-mysql_cv_btype_last_arg_accept=size_t)]
+ ]],
+ [[
+ int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0);
+ ]],
+ [mysql_cv_btype_last_arg_accept=size_t]
+ )]
+ )]
fi
if test "$mysql_cv_btype_last_arg_accept" = "none"; then
mysql_cv_btype_last_arg_accept=int
-fi)
-AC_LANG_POP(C++)
+ fi
+ )
+ AC_LANG_POP([C++])
AC_DEFINE_UNQUOTED([SOCKET_SIZE_TYPE], [$mysql_cv_btype_last_arg_accept],
[The base type of the last arg to accept])
CXXFLAGS="$ac_save_CXXFLAGS"
@@ -42,16 +59,26 @@
#---END:
dnl Find type of qsort
-AC_DEFUN([MYSQL_TYPE_QSORT],
-[AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
-[AC_TRY_COMPILE([#include <stdlib.h>
+AC_DEFUN([MYSQL_TYPE_QSORT],[
+ AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdlib.h>
#ifdef __cplusplus
extern "C"
#endif
void qsort(void *base, size_t nel, size_t width,
int (*compar) (const void *, const void *));
-],
-[int i;], mysql_cv_type_qsort=void, mysql_cv_type_qsort=int)])
+ ]],
+ [[
+ int i;
+ ]]
+ )],
+ [mysql_cv_type_qsort=void],
+ [mysql_cv_type_qsort=int]
+ )]
+ )
AC_DEFINE_UNQUOTED([RETQSORTTYPE], [$mysql_cv_type_qsort],
[The return type of qsort (int or void).])
if test "$mysql_cv_type_qsort" = "void"
@@ -61,46 +88,62 @@
])
#---START: Figure out whether to use 'struct rlimit' or 'struct rlimit64'
-AC_DEFUN([MYSQL_TYPE_STRUCT_RLIMIT],
-[ac_save_CXXFLAGS="$CXXFLAGS"
+AC_DEFUN([MYSQL_TYPE_STRUCT_RLIMIT], [
AC_CACHE_CHECK([struct type to use with setrlimit], mysql_cv_btype_struct_rlimit,
-AC_LANG_PUSH(C++)
-if test "$ac_cv_prog_gxx" = "yes"
+ [
+ AC_REQUIRE([AC_PROG_CXX]) dnl Make sure $GXX is set if GNU C++
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ AC_LANG_PUSH([C++])
+ if test "$GXX" = "yes"
then
# Add -Werror, remove -fbranch-probabilities (Bug #268)
CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
fi
-mysql_cv_btype_struct_rlimit=none
-[AC_TRY_COMPILE([#if defined(inline)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if defined(inline)
#undef inline
#endif
#include <stdlib.h>
#include <sys/resource.h>
-],
-[struct rlimit64 rl; setrlimit(RLIMIT_CORE, &rl);],
-mysql_cv_btype_struct_rlimit="struct rlimit64")]
-if test "$mysql_cv_btype_struct_rlimit" = "none"; then
-mysql_cv_btype_struct_rlimit="struct rlimit"
-fi)
-AC_LANG_POP(C++)
+ ]],
+ [[
+ struct rlimit64 rl; setrlimit(RLIMIT_CORE, &rl);
+ ]]
+ )],
+ [mysql_cv_btype_struct_rlimit="struct rlimit64"],
+ [mysql_cv_btype_struct_rlimit="struct rlimit"]
+ )
+ AC_LANG_POP([C++])
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ ]
+ )
AC_DEFINE_UNQUOTED([STRUCT_RLIMIT], [$mysql_cv_btype_struct_rlimit],
[The struct rlimit type to use with setrlimit])
-CXXFLAGS="$ac_save_CXXFLAGS"
])
#---END:
-AC_DEFUN([MYSQL_TIMESPEC_TS],
-[AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,
-[AC_TRY_COMPILE([#include <pthread.h>
+AC_DEFUN([MYSQL_TIMESPEC_TS], [
+ AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <pthread.h>
#ifdef __cplusplus
extern "C"
#endif
-],
-[struct timespec abstime;
-
+ ]],
+ [[
+ struct timespec abstime;
abstime.ts_sec = time(NULL)+1;
abstime.ts_nsec = 0;
-], mysql_cv_timespec_ts=yes, mysql_cv_timespec_ts=no)])
+ ]]
+ )],
+ [mysql_cv_timespec_ts=yes],
+ [mysql_cv_timespec_ts=no]
+ )]
+ )
if test "$mysql_cv_timespec_ts" = "yes"
then
AC_DEFINE([HAVE_TIMESPEC_TS_SEC], [1],
@@ -108,16 +151,25 @@
fi
])
-AC_DEFUN([MYSQL_TZNAME],
-[AC_CACHE_CHECK([if we have tzname variable], mysql_cv_tzname,
-[AC_TRY_COMPILE([#include <time.h>
+AC_DEFUN([MYSQL_TZNAME], [
+ AC_CACHE_CHECK([if we have tzname variable], mysql_cv_tzname,
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <time.h>
#ifdef __cplusplus
extern "C"
#endif
-],
-[ tzset();
+ ]],
+ [[
+ tzset();
return tzname[0] != 0;
-], mysql_cv_tzname=yes, mysql_cv_tzname=no)])
+ ]]
+ )],
+ [mysql_cv_tzname=yes],
+ [mysql_cv_tzname=no]
+ )]
+ )
if test "$mysql_cv_tzname" = "yes"
then
AC_DEFINE([HAVE_TZNAME], [1], [Have the tzname variable])
@@ -129,37 +181,52 @@
# Some OSes like Mac OS X have that as a replacement for pthread_yield()
AC_CHECK_FUNCS(pthread_yield_np, AC_DEFINE([HAVE_PTHREAD_YIELD_NP],[],[Define if you have pthread_yield_np]))
AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
-[AC_TRY_LINK([#define _GNU_SOURCE
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #define _GNU_SOURCE
#include <pthread.h>
#ifdef __cplusplus
extern "C"
#endif
-],
-[
+ ]],
+ [[
pthread_yield();
-], ac_cv_pthread_yield_zero_arg=yes, ac_cv_pthread_yield_zero_arg=yeso)])
+ ]]
+ )],
+ [ac_cv_pthread_yield_zero_arg=yes],
+ [ac_cv_pthread_yield_zero_arg=no]
+ )]
+ )
if test "$ac_cv_pthread_yield_zero_arg" = "yes"
then
AC_DEFINE([HAVE_PTHREAD_YIELD_ZERO_ARG], [1],
[pthread_yield that doesn't take any arguments])
fi
AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
-[AC_TRY_LINK([#define _GNU_SOURCE
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #define _GNU_SOURCE
#include <pthread.h>
#ifdef __cplusplus
extern "C"
#endif
-],
-[
+ ]],
+ [[
pthread_yield(0);
-], ac_cv_pthread_yield_one_arg=yes, ac_cv_pthread_yield_one_arg=no)])
+ ]]
+ )],
+ [ac_cv_pthread_yield_one_arg=yes],
+ [ac_cv_pthread_yield_one_arg=no]
+ )]
+ )
if test "$ac_cv_pthread_yield_one_arg" = "yes"
then
AC_DEFINE([HAVE_PTHREAD_YIELD_ONE_ARG], [1],
[pthread_yield function with one argument])
fi
-]
-)
+])
#---END:
@@ -201,8 +268,10 @@
for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE"
do
CC="$ac_save_CC $ac_arg"
- AC_TRY_COMPILE(
-[#if !defined(__STDC__)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(__STDC__)
choke me
#endif
/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
@@ -210,11 +279,15 @@
# include <sys/types.h>
# include <sys/stat.h>
#endif
-], [
+ ]],
+ [[
int test (int i, double x);
struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};],
-[am_cv_prog_cc_stdc="$ac_arg"; break])
+ struct s2 {int (*f) (double a);};
+ ]]
+ )],
+ [am_cv_prog_cc_stdc="$ac_arg"; break]
+ )
done
CC="$ac_save_CC"
])
@@ -227,14 +300,15 @@
# Orginal from bash-2.0 aclocal.m4, Changed to use termcap last by monty.
-AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP],
-[
+AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP], [
+
AC_CACHE_VAL(mysql_cv_termcap_lib,
[AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
[AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,
[AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,
[AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,
mysql_cv_termcap_lib=NOT_FOUND)])])])])
+
AC_MSG_CHECKING(for termcap functions library)
if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then
AC_MSG_ERROR([No curses/termcap library found])
@@ -251,35 +325,52 @@
])
dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
-AC_DEFUN([MYSQL_SIGNAL_CHECK],
-[AC_REQUIRE([AC_TYPE_SIGNAL])
+AC_DEFUN([MYSQL_SIGNAL_CHECK], [
AC_MSG_CHECKING(for type of signal functions)
AC_CACHE_VAL(mysql_cv_signal_vintage,
-[
- AC_TRY_LINK([#include <signal.h>],[
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <signal.h>
+ ]],
+ [[
sigset_t ss;
struct sigaction sa;
sigemptyset(&ss); sigsuspend(&ss);
sigaction(SIGINT, &sa, (struct sigaction *) 0);
sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0);
- ], mysql_cv_signal_vintage=posix,
- [
- AC_TRY_LINK([#include <signal.h>], [
+ ]]
+ )],
+ [mysql_cv_signal_vintage=posix],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <signal.h>
+ ]],
+ [[
int mask = sigmask(SIGINT);
sigsetmask(mask); sigblock(mask); sigpause(mask);
- ], mysql_cv_signal_vintage=4.2bsd,
- [
- AC_TRY_LINK([
+ ]]
+ )],
+ [mysql_cv_signal_vintage=4.2bsd],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <signal.h>
- RETSIGTYPE foo() { }], [
+ void foo() { }
+ ]],
+ [[
int mask = sigmask(SIGINT);
sigset(SIGINT, foo); sigrelse(SIGINT);
sighold(SIGINT); sigpause(SIGINT);
- ], mysql_cv_signal_vintage=svr3, mysql_cv_signal_vintage=v7
+ ]]
+ )],
+ [mysql_cv_signal_vintage=svr3],
+ [mysql_cv_signal_vintage=v7]
+ )]
)]
)]
)
-])
AC_MSG_RESULT($mysql_cv_signal_vintage)
if test "$mysql_cv_signal_vintage" = posix; then
AC_DEFINE(HAVE_POSIX_SIGNALS, [1],
@@ -291,25 +382,48 @@
fi
])
-AC_DEFUN([MYSQL_CHECK_GETPW_FUNCS],
-[AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
+AC_DEFUN([MYSQL_CHECK_GETPW_FUNCS], [
+ AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
AC_CACHE_VAL(mysql_cv_can_redecl_getpw,
-[AC_TRY_COMPILE([#include <sys/types.h>
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
#include <pwd.h>
-extern struct passwd *getpwent();], [struct passwd *z; z = getpwent();],
- mysql_cv_can_redecl_getpw=yes,mysql_cv_can_redecl_getpw=no)])
+ extern struct passwd *getpwent();
+ ]],
+ [[
+ struct passwd *z; z = getpwent();
+ ]]
+ )],
+ [mysql_cv_can_redecl_getpw=yes],
+ [mysql_cv_can_redecl_getpw=no]
+ )]
+ )
+
AC_MSG_RESULT($mysql_cv_can_redecl_getpw)
if test "$mysql_cv_can_redecl_getpw" = "no"; then
AC_DEFINE(HAVE_GETPW_DECLS, [1], [getpwent() declaration present])
fi
])
-AC_DEFUN([MYSQL_HAVE_TIOCGWINSZ],
-[AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h)
+AC_DEFUN([MYSQL_HAVE_TIOCGWINSZ],[
+ AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h)
AC_CACHE_VAL(mysql_cv_tiocgwinsz_in_ioctl,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/ioctl.h>], [int x = TIOCGWINSZ;],
- mysql_cv_tiocgwinsz_in_ioctl=yes,mysql_cv_tiocgwinsz_in_ioctl=no)])
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ ]],
+ [[
+ int x = TIOCGWINSZ;
+ ]]
+ )],
+ [mysql_cv_tiocgwinsz_in_ioctl=yes],
+ [mysql_cv_tiocgwinsz_in_ioctl=no]
+ )]
+ )
AC_MSG_RESULT($mysql_cv_tiocgwinsz_in_ioctl)
if test "$mysql_cv_tiocgwinsz_in_ioctl" = "yes"; then
AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1],
@@ -317,24 +431,45 @@
fi
])
-AC_DEFUN([MYSQL_HAVE_FIONREAD],
-[AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
+AC_DEFUN([MYSQL_HAVE_FIONREAD],[
+ AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
AC_CACHE_VAL(mysql_cv_fionread_in_ioctl,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/ioctl.h>], [int x = FIONREAD;],
- mysql_cv_fionread_in_ioctl=yes,mysql_cv_fionread_in_ioctl=no)])
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ ]],
+ [[
+ int x = FIONREAD;
+ ]]
+ )],
+ [mysql_cv_fionread_in_ioctl=yes],
+ [mysql_cv_fionread_in_ioctl=no]
+ )])
AC_MSG_RESULT($mysql_cv_fionread_in_ioctl)
if test "$mysql_cv_fionread_in_ioctl" = "yes"; then
AC_DEFINE([FIONREAD_IN_SYS_IOCTL], [1], [Do we have FIONREAD])
fi
])
-AC_DEFUN([MYSQL_HAVE_TIOCSTAT],
-[AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h)
+AC_DEFUN([MYSQL_HAVE_TIOCSTAT],[
+ AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h)
AC_CACHE_VAL(mysql_cv_tiocstat_in_ioctl,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/ioctl.h>], [int x = TIOCSTAT;],
- mysql_cv_tiocstat_in_ioctl=yes,mysql_cv_tiocstat_in_ioctl=no)])
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
+ #include <sys/ioctl.h>
+ ]],
+ [[
+ int x = TIOCSTAT;
+ ]]
+ )],
+ [mysql_cv_tiocstat_in_ioctl=yes],
+ [mysql_cv_tiocstat_in_ioctl=no]
+ )]
+ )
AC_MSG_RESULT($mysql_cv_tiocstat_in_ioctl)
if test "$mysql_cv_tiocstat_in_ioctl" = "yes"; then
AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL, [1],
@@ -342,11 +477,13 @@
fi
])
-AC_DEFUN([MYSQL_STRUCT_DIRENT_D_INO],
-[AC_REQUIRE([AC_HEADER_DIRENT])
+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_INO],[
+ AC_REQUIRE([AC_HEADER_DIRENT])
AC_MSG_CHECKING(if struct dirent has a d_ino member)
AC_CACHE_VAL(mysql_cv_dirent_has_dino,
-[AC_TRY_COMPILE([
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -366,9 +503,15 @@
# include <ndir.h>
# endif
#endif /* HAVE_DIRENT_H */
-],[
+ ]],
+ [[
struct dirent d; int z; z = d.d_ino;
-], mysql_cv_dirent_has_dino=yes, mysql_cv_dirent_has_dino=no)])
+ ]]
+ )],
+ [mysql_cv_dirent_has_dino=yes],
+ [mysql_cv_dirent_has_dino=no]
+ )]
+ )
AC_MSG_RESULT($mysql_cv_dirent_has_dino)
if test "$mysql_cv_dirent_has_dino" = "yes"; then
AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1],
@@ -376,11 +519,13 @@
fi
])
-AC_DEFUN([MYSQL_STRUCT_DIRENT_D_NAMLEN],
-[AC_REQUIRE([AC_HEADER_DIRENT])
+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_NAMLEN],[
+ AC_REQUIRE([AC_HEADER_DIRENT])
AC_MSG_CHECKING(if struct dirent has a d_namlen member)
AC_CACHE_VAL(mysql_cv_dirent_has_dnamlen,
-[AC_TRY_COMPILE([
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#include <stdio.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
@@ -400,9 +545,15 @@
# include <ndir.h>
# endif
#endif /* HAVE_DIRENT_H */
-],[
+ ]],
+ [[
struct dirent d; int z; z = (int)d.d_namlen;
-], mysql_cv_dirent_has_dnamlen=yes, mysql_cv_dirent_has_dnamlen=no)])
+ ]]
+ )],
+ [mysql_cv_dirent_has_dnamlen=yes],
+ [mysql_cv_dirent_has_dnamlen=no]
+ )]
+ )
AC_MSG_RESULT($mysql_cv_dirent_has_dnamlen)
if test "$mysql_cv_dirent_has_dnamlen" = "yes"; then
AC_DEFINE(STRUCT_DIRENT_HAS_D_NAMLEN, [1],
@@ -411,10 +562,13 @@
])
-AC_DEFUN([MYSQL_TYPE_SIGHANDLER],
-[AC_MSG_CHECKING([whether signal handlers are of type void])
+AC_DEFUN([MYSQL_TYPE_SIGHANDLER],[
+ AC_MSG_CHECKING([whether signal handlers are of type void])
AC_CACHE_VAL(mysql_cv_void_sighandler,
-[AC_TRY_COMPILE([#include <sys/types.h>
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
#include <signal.h>
#ifdef signal
#undef signal
@@ -422,36 +576,47 @@
#ifdef __cplusplus
extern "C"
#endif
-void (*signal ()) ();],
-[int i;], mysql_cv_void_sighandler=yes, mysql_cv_void_sighandler=no)])dnl
+ void (*signal ()) ();
+ ]],
+ [[
+ int i;
+ ]]
+ )],
+ [mysql_cv_void_sighandler=yes],
+ [mysql_cv_void_sighandler=no]
+ )]
+ )
AC_MSG_RESULT($mysql_cv_void_sighandler)
if test "$mysql_cv_void_sighandler" = "yes"; then
AC_DEFINE(VOID_SIGHANDLER, [1], [sighandler type is void (*signal ()) ();])
fi
])
-AC_DEFUN([MYSQL_CXX_BOOL],
-[
+AC_DEFUN([MYSQL_CXX_BOOL],[
AC_REQUIRE([AC_PROG_CXX])
AC_MSG_CHECKING(if ${CXX} supports bool types)
AC_CACHE_VAL(mysql_cv_have_bool,
[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE(,[bool b = true;],
-mysql_cv_have_bool=yes,
-mysql_cv_have_bool=no)
-AC_LANG_RESTORE
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([],[[bool b = true;]])],
+ [mysql_cv_have_bool=yes],
+ [mysql_cv_have_bool=no]
+ )
+ AC_LANG_POP([C++])
])
AC_MSG_RESULT($mysql_cv_have_bool)
if test "$mysql_cv_have_bool" = yes; then
AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
fi
-])dnl
+])
-AC_DEFUN([MYSQL_STACK_DIRECTION],
- [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
- [AC_TRY_RUN([#include <stdlib.h>
+AC_DEFUN([MYSQL_STACK_DIRECTION],[
+ AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdlib.h>
int find_stack_direction ()
{
static char *addr = 0;
@@ -464,22 +629,29 @@
else
return (&dummy > addr) ? 1 : -1;
}
- int main ()
- {
+ ]],
+ [[
exit (find_stack_direction() < 0);
- }], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
- ac_cv_c_stack_direction=)])
+ ]]
+ )],
+ [ac_cv_c_stack_direction=1],
+ [ac_cv_c_stack_direction=-1],
+ [ac_cv_c_stack_direction=]
+ )]
+ )
AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
-])dnl
+])
-AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
-[
+AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],[
AC_MSG_CHECKING(if conversion of longlong to float works)
AC_CACHE_VAL(ac_cv_conv_longlong_to_float,
-[AC_TRY_RUN([#include <stdio.h>
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdio.h>
typedef long long longlong;
-int main()
-{
+ ]],
+ [[
longlong ll=1;
float f;
FILE *file=fopen("conftestval", "w");
@@ -487,9 +659,13 @@
fprintf(file,"%g\n",f);
fclose(file);
return (0);
-}], ac_cv_conv_longlong_to_float=`cat conftestval`,
- ac_cv_conv_longlong_to_float=0,
- ac_cv_conv_longlong_to_float="yes")])dnl # Cross compiling, assume can convert
+ ]]
+ )],
+ [ac_cv_conv_longlong_to_float=`cat conftestval`],
+ [ac_cv_conv_longlong_to_float=0],
+ [ac_cv_conv_longlong_to_float="yes"] dnl Cross compiling, assume can convert
+ )]
+ )
if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
then
ac_cv_conv_longlong_to_float=yes
@@ -592,14 +768,20 @@
dnl MYSQL_NEEDS_MYSYS_NEW
-AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
-[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
+AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],[
+ AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
[
-AC_LANG_PUSH(C++)
-AC_TRY_LINK([], [
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([],
+ [[
class A { public: int b; }; A *a=new A; a->b=10; delete a;
-], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes)
-AC_LANG_POP(C++)
+ ]]
+ )],
+ [mysql_cv_use_mysys_new=no],
+ [mysql_cv_use_mysys_new=yes]
+ )
+ AC_LANG_POP([C++])
])
if test "$mysql_cv_use_mysys_new" = "yes"
then
@@ -669,14 +851,16 @@
AC_DEFUN([MYSQL_CHECK_TIME_T],[
AC_MSG_CHECKING(if time_t is unsigned)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
[[
#include <time.h>
]],
[[
int array[(((time_t)-1) > 0) ? 1 : -1];
- ]] )
- ], [
+ ]]
+ )],
+ [
AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])
AC_MSG_RESULT(yes)
],
=== modified file 'config/ac-macros/readline.m4'
--- a/config/ac-macros/readline.m4 2005-09-15 04:47:24 +0000
+++ b/config/ac-macros/readline.m4 2009-01-09 11:46:26 +0000
@@ -1,16 +1,18 @@
AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [
AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared,
- AC_TRY_COMPILE(
- [
- #include "stdio.h"
- #include "readline/readline.h"
- ],
- [
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ]],
+ [[
HIST_ENTRY entry;
- ],
+ ]]
+ )],
[
mysql_cv_hist_entry_declared=yes
- AC_DEFINE_UNQUOTED(HAVE_HIST_ENTRY, [1],
+ AC_DEFINE_UNQUOTED([HAVE_HIST_ENTRY], [1],
[HIST_ENTRY is defined in the outer libeditreadline])
],
[mysql_cv_libedit_interface=no]
@@ -20,15 +22,17 @@
AC_DEFUN([MYSQL_CHECK_LIBEDIT_INTERFACE], [
AC_CACHE_CHECK([libedit variant of rl_completion_entry_function], mysql_cv_libedit_interface,
- AC_TRY_COMPILE(
- [
- #include "stdio.h"
- #include "readline/readline.h"
- ],
- [
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ]],
+ [[
char res= *(*rl_completion_entry_function)(0,0);
completion_matches(0,0);
- ],
+ ]]
+ )],
[
mysql_cv_libedit_interface=yes
AC_DEFINE_UNQUOTED([USE_LIBEDIT_INTERFACE], [1],
@@ -41,15 +45,17 @@
AC_DEFUN([MYSQL_CHECK_NEW_RL_INTERFACE], [
AC_CACHE_CHECK([defined rl_compentry_func_t and rl_completion_func_t], mysql_cv_new_rl_interface,
- AC_TRY_COMPILE(
- [
- #include "stdio.h"
- #include "readline/readline.h"
- ],
- [
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <stdio.h>
+ #include <readline/readline.h>
+ ]],
+ [[
rl_completion_func_t *func1= (rl_completion_func_t*)0;
rl_compentry_func_t *func2= (rl_compentry_func_t*)0;
- ],
+ ]]
+ )],
[
mysql_cv_new_rl_interface=yes
AC_DEFINE_UNQUOTED([USE_NEW_READLINE_INTERFACE], [1],
@@ -77,24 +83,37 @@
AC_CHECK_FUNC(wcwidth, AC_DEFINE([HAVE_WCWIDTH],[],[Define if you have wcwidth]))
AC_CHECK_FUNC(wcsdup, AC_DEFINE([HAVE_WCSDUP],[],[Define if you check wcsdup]))
-AC_CACHE_CHECK([for mbstate_t], mysql_cv_have_mbstate_t,
-[AC_TRY_COMPILE([
-#include <wchar.h>], [
+ AC_CACHE_CHECK([for mbstate_t], [mysql_cv_have_mbstate_t],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <wchar.h>
+ ]],
+ [[
mbstate_t ps;
mbstate_t *psp;
psp = (mbstate_t *)0;
-], mysql_cv_have_mbstate_t=yes, mysql_cv_have_mbstate_t=no)])
+ ]]
+ )],
+ [mysql_cv_have_mbstate_t=yes],
+ [mysql_cv_have_mbstate_t=no]
+ )]
+ )
if test $mysql_cv_have_mbstate_t = yes; then
AC_DEFINE([HAVE_MBSTATE_T],[],[Define if mysql_cv_have_mbstate_t=yes])
fi
-AC_CACHE_CHECK([for nl_langinfo and CODESET], mysql_cv_langinfo_codeset,
-[AC_TRY_LINK(
-[#include <langinfo.h>],
-[char* cs = nl_langinfo(CODESET);],
-mysql_cv_langinfo_codeset=yes, mysql_cv_langinfo_codeset=no)])
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], [mysql_cv_langinfo_codeset],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <langinfo.h>]],
+ [[char* cs = nl_langinfo(CODESET);]]
+ )],
+ [mysql_cv_langinfo_codeset=yes],
+ [mysql_cv_langinfo_codeset=no]
+ )]
+ )
if test $mysql_cv_langinfo_codeset = yes; then
AC_DEFINE([HAVE_LANGINFO_CODESET],[],[Define if mysql_cv_langinfo_codeset=yes])
fi
-
])
=== modified file 'config/ac-macros/ssl.m4'
--- a/config/ac-macros/ssl.m4 2007-09-26 16:47:55 +0000
+++ b/config/ac-macros/ssl.m4 2009-01-09 11:46:26 +0000
@@ -64,10 +64,14 @@
save_LIBS="$LIBS"
CPPFLAGS="$ssl_incs $CPPFLAGS"
LIBS="$LIBS $ssl_libs"
-AC_TRY_LINK([#include <openssl/ssl.h>],
- [return SSL_library_init();],
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <openssl/ssl.h>]],
+ [[return SSL_library_init();]]
+ )],
[mysql_ssl_found="yes"],
- [mysql_ssl_found="no"])
+ [mysql_ssl_found="no"]
+ )
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
])
=== modified file 'config/ac-macros/zlib.m4'
--- a/config/ac-macros/zlib.m4 2008-04-25 06:32:23 +0000
+++ b/config/ac-macros/zlib.m4 2009-01-09 11:46:26 +0000
@@ -26,12 +26,17 @@
zlibsym=zlibCompileFlags
fi
AC_CACHE_VAL([mysql_cv_compress],
- [AC_TRY_LINK([#include <zlib.h>],
- [return $zlibsym();],
+ [AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <zlib.h>]],
+ [[return $zlibsym();]]
+ )],
[mysql_cv_compress="yes"
AC_MSG_RESULT([ok])],
- [mysql_cv_compress="no"])
- ])
+ [mysql_cv_compress="no"]
+ )
+ ]
+)
CPPFLAGS="$save_CPPFLAGS"
LIBS="$save_LIBS"
])
@@ -74,7 +79,7 @@
;;
*)
AC_ARG_WITH([zlib-dir],
- AC_HELP_STRING([--with-zlib-dir=no|bundled|DIR],
+ AS_HELP_STRING([--with-zlib-dir=no|bundled|DIR],
[Provide MySQL with a custom location of
compression library. Given DIR, zlib binary is
assumed to be in $DIR/lib and header files
=== modified file 'configure.in'
--- a/configure.in 2008-12-31 13:49:36 +0000
+++ b/configure.in 2009-01-09 11:46:26 +0000
@@ -2,17 +2,19 @@
dnl Process this file with autoconf to produce a configure script.
# Minimum Autoconf version required.
-AC_PREREQ(2.52)
+AC_PREREQ(2.59)
-AC_INIT(sql/mysqld.cc)
-AC_CANONICAL_SYSTEM
-# The Docs Makefile.am parses this line!
-# remember to also update version.c in ndb.
+# Remember to also update version.c in ndb.
# When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version().
+AC_INIT([MySQL Server], [6.0.9-alpha], [], [mysql])
+AC_CONFIG_SRCDIR([sql/mysqld.cc])
+AC_CANONICAL_TARGET
+# automake 1.9.2 has 'filename-length-max=99', but not 1.6.2
+AM_INIT_AUTOMAKE([1.6.2])
+AC_PROG_LIBTOOL
-AM_INIT_AUTOMAKE(mysql, 6.0.10-alpha)
-AM_CONFIG_HEADER([include/config.h:config.h.in])
+AC_CONFIG_HEADERS([include/config.h])
NDB_VERSION_MAJOR=6
NDB_VERSION_MINOR=2
@@ -64,8 +66,8 @@
sinclude(config/ac-macros/ssl.m4)
sinclude(config/ac-macros/libevent.m4)
sinclude(config/ac-macros/zlib.m4)
-sinclude(config/search_for_lib.m4)
-sinclude(config/libmemcached.m4)
+sinclude(config/ac-macros/search_for_lib.m4)
+sinclude(config/ac-macros/libmemcached.m4)
# Remember to add a directory sql/share/LANGUAGE
AVAILABLE_LANGUAGES="\
@@ -134,8 +136,6 @@
AC_SUBST(SAVE_CXXLDFLAGS)
AC_SUBST(CXXLDFLAGS)
-#AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE
-
AM_SANITY_CHECK
# This is needed is SUBDIRS is set
AC_PROG_MAKE_SET
@@ -193,8 +193,8 @@
dnl Checks for programs.
AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CXX
+AC_PROG_CC dnl Sets $GCC="yes" if GNU C
+AC_PROG_CXX dnl Sets $GXX="yes" if GNU C++
AC_PROG_CPP
# Print version of CC and CXX compiler (if they support --version)
@@ -219,14 +219,14 @@
# Fix for sgi gcc / sgiCC which tries to emulate gcc
if test "$CC" = "sgicc"
then
- ac_cv_prog_gcc="no"
+ GCC="no"
fi
if test "$CXX" = "sgi++"
then
GXX="no"
fi
-if test "$ac_cv_prog_gcc" = "yes"
+if test "$GCC" = "yes"
then
AS="$CC -c"
AC_SUBST(AS)
@@ -236,9 +236,6 @@
# Still need ranlib for readline; local static use only so no libtool.
AC_PROG_RANLIB
-# We use libtool
-#AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
# Ensure that we have --preserve-dup-deps defines, otherwise we get link
# problems of 'mysql' with CXX=g++
@@ -263,33 +260,33 @@
#check the return type of sprintf
AC_MSG_CHECKING("return type of sprintf")
-AC_TRY_RUN([
- int main()
- {
+AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([],
+ [[
char* s = "hello";
char buf[6];
if((int)sprintf(buf, s) == strlen(s))
return 0;
-
return -1;
- }
- ],
+ ]]
+ )],
[AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
AC_MSG_RESULT("int")],
- [AC_TRY_RUN([
- int main()
- {
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([],
+ [[
char* s = "hello";
char buf[6];
if((char*)sprintf(buf,s) == buf + strlen(s))
return 0;
return -1;
- } ],
+ ]]
+ )],
[AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
AC_MSG_RESULT("ptr")],
[AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
- AC_MSG_RESULT("garbage")]
- )],
+ AC_MSG_RESULT("garbage")],
+ [foobar=1])], dnl Unreachable, but to avoid warning set something
# Cross compile, assume POSIX
[AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
AC_MSG_RESULT("int (we assume)")]
@@ -643,7 +640,7 @@
AC_MSG_CHECKING(whether features provided by the user community should be included.)
AC_ARG_ENABLE(community-features,
- AC_HELP_STRING(
+ AS_HELP_STRING(
[--enable-community-features],
[Enable additional features provided by the user community.]),
[ ENABLE_COMMUNITY_FEATURES=$enableval ],
@@ -916,25 +913,32 @@
fi
_libs=${LIBS}
+
AC_CHECK_HEADER(tcpd.h,
LIBS="-lwrap $LIBS"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
- AC_TRY_LINK([#include <tcpd.h>
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
-
struct request_info *req;
-],[hosts_access (req)],
- AC_MSG_RESULT(yes)
- AC_DEFINE([LIBWRAP], [1], [Define if you have -lwrap])
+ ]],
+ [[
+ hosts_access (req);
+ ]]
+ )],
+ [AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_LIBWRAP], [1], [Define if have -lwrap])
if test "$with_libwrap" != "yes"; then
WRAPLIBS="-L${with_libwrap}/lib"
fi
- WRAPLIBS="${WRAPLIBS} -lwrap",
- AC_MSG_RESULT(no)
- CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
- CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+ WRAPLIBS="${WRAPLIBS} -lwrap"],
+ [AC_MSG_RESULT(no)
+ CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}]),
+ [CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}])
+
LDFLAGS=${_ldflags} LIBS=${_libs}
;;
esac
@@ -993,13 +997,13 @@
NON_THREADED_LIBS="$LIBS"
AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, int64, uint64,
- uchar, uint, ulong],[],[], [
+ uchar, uint, ulong],[],[], [[
#include <sys/types.h>
-])
-AC_CHECK_TYPES([fp_except], [], [], [
+]])
+AC_CHECK_TYPES([fp_except], [], [], [[
#include <sys/types.h>
#include <ieeefp.h>
-])
+]])
#
# Some system specific hacks
@@ -1070,7 +1074,7 @@
with_named_thread="-lpthread"
fi
# Fixes for HPUX 11.0 compiler
- if test "$ac_cv_prog_gcc" = "no"
+ if test "$GCC" != "yes"
then
CFLAGS="$CFLAGS -DHAVE_BROKEN_INLINE"
# set working flags first in line, letting override it (i. e. for debug):
@@ -1081,7 +1085,7 @@
fi
;;
*rhapsody*)
- if test "$ac_cv_prog_gcc" = "yes"
+ if test "$GCC" = "yes"
then
CPPFLAGS="$CPPFLAGS -traditional-cpp "
CFLAGS="-DHAVE_CTHREADS_WRAPPER -DDO_NOT_REMOVE_THREAD_WRAPPERS"
@@ -1093,7 +1097,7 @@
fi
;;
*darwin5*)
- if test "$ac_cv_prog_gcc" = "yes"
+ if test "$GCC" = "yes"
then
FLAGS="-traditional-cpp -DHAVE_DARWIN5_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
CFLAGS="$CFLAGS $FLAGS"
@@ -1103,7 +1107,7 @@
fi
;;
*darwin6*)
- if test "$ac_cv_prog_gcc" = "yes"
+ if test "$GCC" = "yes"
then
FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DDONT_DECLARE_CXA_PURE_VIRTUAL "
CFLAGS="$CFLAGS $FLAGS"
@@ -1112,7 +1116,7 @@
fi
;;
*darwin*)
- if test "$ac_cv_prog_gcc" = "yes"
+ if test "$GCC" = "yes"
then
FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -DDONT_DECLARE_CXA_PURE_VIRTUAL"
CFLAGS="$CFLAGS $FLAGS"
@@ -1160,7 +1164,7 @@
;;
dnl Is this the right match for DEC OSF on alpha?
*dec-osf*)
- if test "$ac_cv_prog_gcc" = "yes" && test "$host_cpu" = "alpha"
+ if test "$GCC" = "yes" && test "$host_cpu" = "alpha"
then
AC_MSG_WARN([Adding defines for DEC OSF on alpha])
CFLAGS="$CFLAGS -mieee"
@@ -1311,8 +1315,13 @@
AC_DEFINE([HAVE_LINUXTHREADS], [1],
[Whether we are using Xavier Leroy's LinuxThreads])
# Linux 2.0 sanity check
- AC_TRY_COMPILE([#include <sched.h>], [int a = sched_get_priority_min(1);], ,
- AC_MSG_ERROR([Syntax error in sched.h. Change _P to __P in the /usr/include/sched.h file. See the Installation chapter in the Reference Manual]))
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <sched.h>]],
+ [[int a = sched_get_priority_min(1);]]
+ )],
+ [],
+ [AC_MSG_ERROR([Syntax error in sched.h. Change _P to __P in the /usr/include/sched.h file. See the Installation chapter in the Reference Manual])])
# RedHat 5.0 does not work with dynamic linking of this. -static also
# gives a speed increase in linux so it does not hurt on other systems.
with_named_thread="-lpthread"
@@ -1330,9 +1339,12 @@
AC_MSG_CHECKING("for pthread_create in -lpthread")
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lpthread"
- AC_TRY_LINK( [#include <pthread.h>],
- [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
- AC_MSG_RESULT("yes"),
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[(void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0);]]
+ )],
+ [AC_MSG_RESULT("yes")],
[ AC_MSG_RESULT("no")
AC_MSG_ERROR([
This is a Linux system claiming to support threads, either Linuxthreads or NPTL, but linking a test program failed.
@@ -1541,10 +1553,13 @@
AC_MSG_RESULT("no")
# pthread_create is in standard libraries (As in BSDI 3.0)
AC_MSG_CHECKING("for pthread_create in -libc");
- AC_TRY_LINK(
- [#include <pthread.h>],
- [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
- with_posix_threads=yes, with_posix_threads=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[(void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0);]]
+ )],
+ [with_posix_threads=yes],
+ [with_posix_threads=no])
AC_MSG_RESULT("$with_posix_threads")
if test "$with_posix_threads" = "no"
then
@@ -1552,20 +1567,26 @@
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lpthread"
CLIENT_THREAD_LIBS="-lpthread"
- AC_TRY_LINK(
- [#include <pthread.h>],
- [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
- with_posix_threads=yes, with_posix_threads=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[(void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0);]]
+ )],
+ [with_posix_threads=yes],
+ [with_posix_threads=no])
AC_MSG_RESULT("$with_posix_threads")
if test "$with_posix_threads" = "no"
then
LIBS=" $ac_save_LIBS -lpthreads"
CLIENT_THREAD_LIBS="-lpthreads"
AC_MSG_CHECKING("for pthread_create in -lpthreads")
- AC_TRY_LINK(
- [#include <pthread.h>],
- [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
- with_posix_threads=yes, with_posix_threads=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0);]]
+ )],
+ [with_posix_threads=yes],
+ [with_posix_threads=no])
AC_MSG_RESULT("$with_posix_threads")
if test "$with_posix_threads" = "no"
then
@@ -1573,10 +1594,13 @@
LIBS="$ac_save_LIBS -pthread"
CLIENT_THREAD_LIBS="-pthread"
AC_MSG_CHECKING("for pthread_create in -pthread")
- AC_TRY_LINK(
- [#include <pthread.h>],
- [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
- with_posix_threads=yes, with_posix_threads=no)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <pthread.h>]],
+ [[pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0);]]
+ )],
+ [with_posix_threads=yes],
+ [with_posix_threads=no])
AC_MSG_RESULT("$with_posix_threads")
fi
fi
@@ -1636,17 +1660,9 @@
esac
-# System characteristics
-case $SYSTEM_TYPE in
- *netware*) ;;
- *)
-AC_SYS_RESTARTABLE_SYSCALLS
- ;;
-esac
-
# Build optimized or debug version ?
# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
+if test "$GCC" = "yes"
then
DEBUG_CFLAGS="-g"
DEBUG_OPTIMIZE_CC="-O"
@@ -1734,7 +1750,7 @@
# If we should allow error injection tests
AC_ARG_WITH(error-inject,
- AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
+ AS_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
[ with_error_inject=$withval ],
[ with_error_inject=no ])
@@ -1748,7 +1764,7 @@
fi
AC_ARG_WITH([fast-mutexes],
- AC_HELP_STRING([--with-fast-mutexes],
+ AS_HELP_STRING([--with-fast-mutexes],
[Compile with fast mutexes (default is disabled)]),
[with_fast_mutexes=$withval], [with_fast_mutexes=no])
@@ -1764,7 +1780,7 @@
fi
AC_ARG_WITH([atomic-ops],
- AC_HELP_STRING([--with-atomic-ops=rwlocks|smp|up],
+ AS_HELP_STRING([--with-atomic-ops=rwlocks|smp|up],
[Implement atomic operations using pthread rwlocks or atomic CPU
instructions for multi-processor or uniprocessor
configuration. By default gcc built-in sync functions are used,
@@ -1776,11 +1792,14 @@
[Use pthread rwlocks for atomic ops]) ;;
"smp") ;;
"")
- AC_CACHE_CHECK([whether the compiler provides atomic builtins],
- [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
- int main()
- {
- int foo= -10; int bar= 10;
+ AC_CACHE_CHECK(
+ [whether the compiler provides atomic builtins],
+ [mysql_cv_gcc_atomic_builtins],
+ [AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([],
+ [[
+ int foo= -10;
+ int bar= 10;
if (!__sync_fetch_and_add(&foo, bar) || foo)
return -1;
bar= __sync_lock_test_and_set(&foo, bar);
@@ -1790,8 +1809,9 @@
if (bar)
return -1;
return 0;
- }
- ], [mysql_cv_gcc_atomic_builtins=yes_but_disabled],
+ ]]
+ )],
+ [mysql_cv_gcc_atomic_builtins=yes_but_disabled],
[mysql_cv_gcc_atomic_builtins=no],
[mysql_cv_gcc_atomic_builtins=no])])
@@ -1836,7 +1856,7 @@
[with_lowmem=no])
if test "$with_lowmem" = "yes"
then
- if test "$ac_cv_prog_gcc" = "yes"
+ if test "$GCC" = "yes"
then
LM_CFLAGS="-fno-inline"
else
@@ -1860,7 +1880,7 @@
AC_SUBST(COMPILATION_COMMENT)
AC_MSG_CHECKING("need of special linking flags")
-if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
+if test "$TARGET_LINUX" = "true" -a "$GCC" = "yes" -a "$all_is_static" != "yes"
then
LDFLAGS="$LDFLAGS -rdynamic"
AC_MSG_RESULT("-rdynamic")
@@ -1883,7 +1903,6 @@
AC_C_CONST
AC_C_INLINE
AC_TYPE_OFF_T
-AC_STRUCT_ST_RDEV
AC_HEADER_TIME
AC_STRUCT_TM
MYSQL_NEEDS_MYSYS_NEW
@@ -1936,12 +1955,18 @@
AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't
# follow any standard), we'll use well-defined preprocessor macros:
-AC_TRY_CPP([
+AC_PREPROC_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
#error USE_PRAGMA_IMPLEMENTATION
#endif
-],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")
-
+ ]],
+ []
+ )],
+ [AC_MSG_RESULT(no)],
+ [AC_MSG_RESULT(yes)
+ CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION"])
# This always gives a warning. Ignore it unless you are cross compiling
AC_C_BIGENDIAN
#---START: Used in for client configure
@@ -1973,8 +1998,8 @@
fi
;;
esac
-AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
-AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
+AC_CHECK_TYPES([sigset_t, off_t], [], [], [[#include <sys/types.h>]])
+AC_CHECK_TYPES([size_t], [], [], [[#include <stdio.h>]])
AC_CHECK_TYPES([u_int32_t])
MYSQL_PTHREAD_YIELD
@@ -1989,7 +2014,6 @@
dnl Checks for library functions.
AC_FUNC_ALLOCA
AC_PROG_GCC_TRADITIONAL
-AC_TYPE_SIGNAL
AC_CHECK_FUNCS(re_comp regcomp strdup)
dnl Sun compilers have their own vis.h that is about something
@@ -2018,7 +2042,6 @@
# Already-done: strcasecmp
AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
-AC_STAT_MACROS_BROKEN
MYSQL_SIGNAL_CHECK
MYSQL_CHECK_GETPW_FUNCS
MYSQL_HAVE_TIOCGWINSZ
@@ -2070,11 +2093,9 @@
ORG_CFLAGS="$CFLAGS"
if test "$GCC" != "yes"; then
- AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
+ AC_SYS_COMPILER_FLAG([-nolib_inline],[nolib_inline],[CFLAGS])
fi
-#AC_FUNC_MMAP
-AC_TYPE_SIGNAL
MYSQL_TYPE_QSORT
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
@@ -2117,17 +2138,24 @@
# Check that isinf() is available in math.h and can be used in both C and C++
# code
AC_MSG_CHECKING(for isinf in <math.h>)
-AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
- AC_MSG_RESULT(yes)
+AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <math.h>]],
+ [[float f = 0.0; int r = isinf(f); return r]]
+ )],
+ [AC_MSG_RESULT(yes)
AC_MSG_CHECKING(whether isinf() can be used in C++ code)
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
- AC_MSG_RESULT(no))
- AC_LANG_RESTORE,
- AC_MSG_RESULT(no))
+ AC_LANG_PUSH([C++])
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include <math.h>]],
+ [[float f = 0.0; int r = isinf(f); return r]]
+ )],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function])],
+ [AC_MSG_RESULT(no)])
+ AC_LANG_POP([C++])],
+ [AC_MSG_RESULT(no)])
CFLAGS="$ORG_CFLAGS"
@@ -2143,8 +2171,7 @@
# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH([C++])
# Test whether madvise() is declared in C++ code -- it is not on some
# systems, such as Solaris
@@ -2161,13 +2188,15 @@
# We also must remove -W and -Wcheck which on icc produces warnings that
# we don't want to catch with -Werror
-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
+if test "$GXX" = "yes" -a "$with_other_libc" = "no"
then
CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
fi
-AC_TRY_COMPILE(
-[#undef inline
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #undef inline
#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
#define _REENTRANT
#endif
@@ -2176,12 +2205,19 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <netdb.h>],
-[int skr;
- struct hostent *foo = gethostbyaddr_r((const char *) 0,
- 0, 0, (struct hostent *) 0, (char *) NULL, 0, &skr); return (foo == 0);],
-mysql_cv_gethost_style=solaris, mysql_cv_gethost_style=other))
-AC_LANG_RESTORE
+ #include <netdb.h>
+ ]],
+ [[
+ int skr;
+ struct hostent *foo =
+ gethostbyaddr_r((const char *) 0,
+ 0, 0, (struct hostent *) 0, (char *) NULL, 0, &skr);
+ return (foo == 0);
+ ]]
+ )],
+ [mysql_cv_gethost_style=solaris],
+ [mysql_cv_gethost_style=other]))
+AC_LANG_POP([C++])
CXXFLAGS="$ac_save_CXXFLAGS"
if test "$mysql_cv_gethost_style" = "solaris"
then
@@ -2194,14 +2230,15 @@
# Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([style of gethostbyname_r routines], mysql_cv_gethostbyname_style,
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
+AC_LANG_PUSH([C++])
+if test "$GXX" = "yes" -a "$with_other_libc" = "no"
then
CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
fi
-AC_TRY_COMPILE(
-[#undef inline
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #undef inline
#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
#define _REENTRANT
#endif
@@ -2210,13 +2247,17 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <netdb.h>],
-[int skr;
-
+ #include <netdb.h>
+ ]],
+ [[
+ int skr;
skr = gethostbyname_r((const char *) 0,
- (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);],
-mysql_cv_gethostbyname_style=glibc2, mysql_cv_gethostbyname_style=other))
-AC_LANG_RESTORE
+ (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);
+ ]]
+ )],
+ [mysql_cv_gethostbyname_style=glibc2],
+ [mysql_cv_gethostbyname_style=other]))
+AC_LANG_POP([C++])
CXXFLAGS="$ac_save_CXXFLAGS"
if test "$mysql_cv_gethostbyname_style" = "glibc2"
then
@@ -2227,14 +2268,15 @@
# Check 3rd argument of getthostbyname_r
ac_save_CXXFLAGS="$CXXFLAGS"
AC_CACHE_CHECK([3 argument to gethostbyname_r routines], mysql_cv_gethostbyname_arg,
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
+AC_LANG_PUSH([C++])
+if test "$GXX" = "yes" -a "$with_other_libc" = "no"
then
CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
fi
-AC_TRY_COMPILE(
-[#undef inline
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #undef inline
#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
#define _REENTRANT
#endif
@@ -2243,12 +2285,18 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <netdb.h>],
-[int skr;
-
- skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (struct hostent_data*) 0);],
-mysql_cv_gethostbyname_arg=hostent_data, mysql_cv_gethostbyname_arg=char))
-AC_LANG_RESTORE
+ #include <netdb.h>
+ ]],
+ [[
+ int skr;
+ skr = gethostbyname_r((const char *) 0, (struct hostent*) 0, (struct hostent_data*) 0);
+ ]]
+ )],
+ [mysql_cv_gethostbyname_arg=hostent_data],
+ [mysql_cv_gethostbyname_arg=char]
+ )
+)
+AC_LANG_POP([C++])
CXXFLAGS="$ac_save_CXXFLAGS"
if test "$mysql_cv_gethostbyname_arg" = "hostent_data"
then
@@ -2259,15 +2307,24 @@
# Check definition of pthread_getspecific
AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
-AC_TRY_COMPILE(
-[#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
-#include <pthread.h> ],
-[ void *pthread_getspecific(pthread_key_t key);
-pthread_getspecific((pthread_key_t) NULL); ],
-mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other))
+ #include <pthread.h>
+ ]],
+ [[
+ void *pthread_getspecific(pthread_key_t key);
+ pthread_getspecific((pthread_key_t) NULL);
+ ]]
+ )],
+ [mysql_cv_getspecific_args=POSIX],
+ [mysql_cv_getspecific_args=other]
+ )
+)
if test "$mysql_cv_getspecific_args" = "other"
then
AC_DEFINE([HAVE_NONPOSIX_PTHREAD_GETSPECIFIC], [1],
@@ -2276,17 +2333,25 @@
# Check definition of pthread_mutex_init
AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args,
- AC_TRY_COMPILE(
-[#if !defined(SCO) && !defined(__osf__)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
-#include <pthread.h> ],
-[
+ #include <pthread.h>
+ ]],
+ [[
pthread_mutexattr_t attr;
pthread_mutex_t mp;
- pthread_mutex_init(&mp,&attr); ],
-mysql_cv_mutex_init_args=POSIX, mysql_cv_mutex_init_args=other))
+ pthread_mutex_init(&mp,&attr);
+ ]]
+ )],
+ [mysql_cv_mutex_init_args=POSIX],
+ [mysql_cv_mutex_init_args=other]
+ )
+)
if test "$mysql_cv_mutex_init_args" = "other"
then
AC_DEFINE([HAVE_NONPOSIX_PTHREAD_MUTEX_INIT], [1],
@@ -2297,16 +2362,25 @@
#---START: Used in for client configure
# Check definition of readdir_r
AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
-AC_TRY_LINK(
-[#if !defined(SCO) && !defined(__osf__)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
#include <pthread.h>
-#include <dirent.h>],
-[ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
-readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); ],
-mysql_cv_readdir_r=POSIX, mysql_cv_readdir_r=other))
+ #include <dirent.h>
+ ]],
+ [[
+ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result);
+ readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL);
+ ]]
+ )],
+ [mysql_cv_readdir_r=POSIX],
+ [mysql_cv_readdir_r=other]
+ )
+)
if test "$mysql_cv_readdir_r" = "POSIX"
then
AC_DEFINE([HAVE_READDIR_R], [1], [POSIX readdir_r])
@@ -2314,19 +2388,27 @@
# Check definition of posix sigwait()
AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
-AC_TRY_LINK(
-[#if !defined(SCO) && !defined(__osf__)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
#include <pthread.h>
-#include <signal.h>],
-[#ifndef _AIX
+ #include <signal.h>
+ ]],
+ [[
+ #ifndef _AIX
sigset_t set;
int sig;
sigwait(&set,&sig);
-#endif],
-mysql_cv_sigwait=POSIX, mysql_cv_sigwait=other))
+ #endif
+ ]]
+ )],
+ [mysql_cv_sigwait=POSIX],
+ [mysql_cv_sigwait=other])
+)
if test "$mysql_cv_sigwait" = "POSIX"
then
AC_DEFINE([HAVE_SIGWAIT], [1], [POSIX sigwait])
@@ -2337,17 +2419,26 @@
unset mysql_cv_sigwait
# Check definition of posix sigwait()
AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
-AC_TRY_LINK(
-[#if !defined(SCO) && !defined(__osf__)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
#include <pthread.h>
-#include <signal.h>],
-[sigset_t set;
+ #include <signal.h>
+ ]],
+ [[
+ sigset_t set;
int sig;
-sigwait(&set);],
-mysql_cv_sigwait=NONPOSIX, mysql_cv_sigwait=other))
+ sigwait(&set);
+ ]]
+ )],
+ [mysql_cv_sigwait=NONPOSIX],
+ [mysql_cv_sigwait=other]
+ )
+)
if test "$mysql_cv_sigwait" = "NONPOSIX"
then
AC_DEFINE([HAVE_NONPOSIX_SIGWAIT], [1], [sigwait with one argument])
@@ -2357,15 +2448,24 @@
# Check if pthread_attr_setscope() exists
AC_CACHE_CHECK("for pthread_attr_setscope", mysql_cv_pthread_attr_setscope,
-AC_TRY_LINK(
-[#if !defined(SCO) && !defined(__osf__)
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #if !defined(SCO) && !defined(__osf__)
#define _REENTRANT
#endif
#define _POSIX_PTHREAD_SEMANTICS
-#include <pthread.h>],
-[pthread_attr_t thr_attr;
-pthread_attr_setscope(&thr_attr,0);],
-mysql_cv_pthread_attr_setscope=yes, mysql_cv_pthread_attr_setscope=no))
+ #include <pthread.h>
+ ]],
+ [[
+ pthread_attr_t thr_attr;
+ pthread_attr_setscope(&thr_attr,0);
+ ]]
+ )],
+ [mysql_cv_pthread_attr_setscope=yes],
+ [mysql_cv_pthread_attr_setscope=no]
+ )
+)
if test "$mysql_cv_pthread_attr_setscope" = "yes"
then
AC_DEFINE([HAVE_PTHREAD_ATTR_SETSCOPE], [1], [pthread_attr_setscope])
@@ -2373,15 +2473,23 @@
# Check for bad includes
AC_MSG_CHECKING("can netinet files be included")
-AC_TRY_COMPILE(
-[#include <sys/types.h>
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
-#include <netinet/tcp.h>],
-[ printf("1\n"); ],
-netinet_inc=yes, netinet_inc=no)
+ #include <netinet/tcp.h>
+ ]],
+ [[
+ printf("1\n");
+ ]]
+ )],
+ [netinet_inc=yes],
+ [netinet_inc=no]
+)
if test "$netinet_inc" = "no"
then
AC_DEFINE([HAVE_BROKEN_NETINET_INCLUDES], [1], [Can netinet be included])
@@ -2389,35 +2497,52 @@
AC_MSG_RESULT("$netinet_inc")
AC_CACHE_CHECK([support for weak symbols], mysql_cv_weak_symbol,
-[AC_TRY_LINK([],[
- extern void __attribute__((weak)) foo(void);
-], [mysql_cv_weak_symbol=yes], [mysql_cv_weak_symbol=no])])
-
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([],[[extern void __attribute__((weak)) foo(void);]])],
+ [mysql_cv_weak_symbol=yes],
+ [mysql_cv_weak_symbol=no]
+ )
+)
if test "x$mysql_cv_weak_symbol" = xyes; then
AC_DEFINE(HAVE_WEAK_SYMBOL, 1,
[Define to 1 if compiler supports weak symbol attribute.])
fi
AC_CACHE_CHECK([whether __bss_start is defined], mysql_cv_bss_start,
-[AC_TRY_LINK([],[
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([],
+ [[
extern char *__bss_start;
return __bss_start ? 1 : 0;
-], [mysql_cv_bss_start=yes], [mysql_cv_bss_start=no])])
-
+ ]]
+ )],
+ [mysql_cv_bss_start=yes],
+ [mysql_cv_bss_start=no]
+ )
+)
if test "x$mysql_cv_bss_start" = xyes; then
AC_DEFINE(HAVE_BSS_START, 1,
[Define to 1 if compiler defines __bss_start.])
fi
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
+AC_LANG_PUSH([C++])
AC_CHECK_HEADERS(cxxabi.h)
AC_CACHE_CHECK([for abi::__cxa_demangle], mysql_cv_cxa_demangle,
-[AC_TRY_LINK([#include <cxxabi.h>], [
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[
+ #include <cxxabi.h>
+ ]],
+ [[
char *foo= 0; int bar= 0;
foo= abi::__cxa_demangle(foo, foo, 0, &bar);
-], [mysql_cv_cxa_demangle=yes], [mysql_cv_cxa_demangle=no])])
-AC_LANG_RESTORE
+ ]]
+ )],
+ [mysql_cv_cxa_demangle=yes],
+ [mysql_cv_cxa_demangle=no]
+ )
+)
+AC_LANG_POP([C++])
if test "x$mysql_cv_cxa_demangle" = xyes; then
AC_DEFINE(HAVE_ABI_CXA_DEMANGLE, 1,
@@ -2627,12 +2752,11 @@
AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)
else
# Use system readline library
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
+ AC_LANG_PUSH([C++])
MYSQL_CHECK_LIBEDIT_INTERFACE
MYSQL_CHECK_NEW_RL_INTERFACE
MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY
- AC_LANG_RESTORE
+ AC_LANG_POP([C++])
if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "$srcdir/cmd-line-utils/readline"]
then
# Use the new readline interface, but only if the package includes a bundled libreadline
=== modified file 'dbug/Makefile.am'
--- a/dbug/Makefile.am 2008-08-16 05:15:49 +0000
+++ b/dbug/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = libdbuglt.la $(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la ${ZLIB_LIBS}
pkglib_LTLIBRARIES = libdbug.la
@@ -73,6 +73,3 @@
# a hack to have executable in builddir, not in srcdir
tests-t: tests-t.pl
cp -f $(srcdir)/tests-t.pl ./tests-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/Makefile.am'
--- a/extra/Makefile.am 2008-12-14 11:36:15 +0000
+++ b/extra/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/sql
LDADD = @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/mysys/libmysyslt.la \
@@ -57,6 +57,3 @@
perror.o: perror.c
$(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $<
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/libevent/Makefile.am'
--- a/extra/libevent/Makefile.am 2008-04-29 03:50:47 +0000
+++ b/extra/libevent/Makefile.am 2009-01-07 10:58:33 +0000
@@ -34,4 +34,4 @@
-e 's/#ifndef /#ifndef _EVENT_/' < $(top_srcdir)/include/config.h >> $@
echo "#endif" >> $@
-INCLUDES = -Icompat -I$(top_srcdir)/include
+AM_CPPFLAGS = -Icompat -I$(top_srcdir)/include
=== modified file 'extra/yassl/Makefile.am'
--- a/extra/yassl/Makefile.am 2008-09-01 22:30:06 +0000
+++ b/extra/yassl/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,5 +1,2 @@
SUBDIRS = taocrypt src testsuite
EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/yassl/src/Makefile.am'
--- a/extra/yassl/src/Makefile.am 2006-11-27 22:12:05 +0000
+++ b/extra/yassl/src/Makefile.am 2009-01-09 18:52:46 +0000
@@ -1,12 +1,11 @@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
+
+AM_CPPFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX \
+ -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
noinst_LTLIBRARIES = libyassl.la
libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \
template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
-AM_CXXFLAGS = -DYASSL_PURE_C -DYASSL_PREFIX
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/yassl/taocrypt/Makefile.am'
--- a/extra/yassl/taocrypt/Makefile.am 2008-09-01 22:30:06 +0000
+++ b/extra/yassl/taocrypt/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,5 +1,2 @@
SUBDIRS = src test benchmark
EXTRA_DIST = CMakeLists.txt $(wildcard mySTL/*.hpp)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/yassl/taocrypt/benchmark/Makefile.am'
--- a/extra/yassl/taocrypt/benchmark/Makefile.am 2007-03-22 15:58:46 +0000
+++ b/extra/yassl/taocrypt/benchmark/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,9 +1,7 @@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
+
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../mySTL
noinst_PROGRAMS = benchmark
benchmark_SOURCES = benchmark.cpp
benchmark_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
benchmark_CXXFLAGS = -DYASSL_PURE_C
EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/yassl/taocrypt/src/Makefile.am'
--- a/extra/yassl/taocrypt/src/Makefile.am 2006-11-27 22:12:05 +0000
+++ b/extra/yassl/taocrypt/src/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,4 +1,5 @@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
+
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../mySTL
noinst_LTLIBRARIES = libtaocrypt.la
@@ -12,6 +13,3 @@
EXTRA_DIST = $(wildcard ../include/*.hpp)
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
=== modified file 'extra/yassl/taocrypt/test/Makefile.am'
--- a/extra/yassl/taocrypt/test/Makefile.am 2007-01-29 17:48:20 +0000
+++ b/extra/yassl/taocrypt/test/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,9 +1,7 @@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../mySTL
+
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../mySTL
noinst_PROGRAMS = test
test_SOURCES = test.cpp
test_LDADD = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
test_CXXFLAGS = -DYASSL_PURE_C
EXTRA_DIST = make.bat
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'extra/yassl/testsuite/Makefile.am'
--- a/extra/yassl/testsuite/Makefile.am 2007-01-29 17:48:20 +0000
+++ b/extra/yassl/testsuite/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,4 +1,5 @@
-INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
+
+AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL
noinst_PROGRAMS = testsuite
testsuite_SOURCES = testsuite.cpp ../taocrypt/test/test.cpp \
../examples/client/client.cpp ../examples/server/server.cpp \
@@ -9,6 +10,3 @@
$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
EXTRA_DIST = testsuite.dsp test.hpp input quit make.bat
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2008-11-22 15:24:06 +0000
+++ b/include/Makefile.am 2009-01-07 10:58:33 +0000
@@ -66,6 +66,3 @@
# generated by configure from the .h.in files
dist-hook:
$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'include/config-win.h'
--- a/include/config-win.h 2008-12-17 18:40:14 +0000
+++ b/include/config-win.h 2009-01-09 11:46:26 +0000
@@ -192,7 +192,6 @@
#define SIGPIPE SIGINT
#define RETQSORTTYPE void
#define QSORT_TYPE_IS_VOID
-#define RETSIGTYPE void
#define SOCKET_SIZE_TYPE int
#define my_socket_defined
#define byte_defined
=== modified file 'include/my_global.h'
--- a/include/my_global.h 2008-12-13 16:34:25 +0000
+++ b/include/my_global.h 2009-01-09 11:46:26 +0000
@@ -683,7 +683,7 @@
#define INVALID_SOCKET -1
#endif
/* Type for fuctions that handles signals */
-#define sig_handler RETSIGTYPE
+#define sig_handler void
C_MODE_START
typedef void (*sig_return)();/* Returns type from signal */
C_MODE_END
=== modified file 'libmysql/Makefile.am'
--- a/libmysql/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/libmysql/Makefile.am 2009-01-07 10:58:33 +0000
@@ -23,7 +23,7 @@
target = libmysqlclient.la
target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
LIBS = @CLIENT_LIBS@
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
include $(srcdir)/Makefile.shared
@@ -104,6 +104,3 @@
echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \
gtar cvzf $$dir.tar.gz $$dir; \
cd $$dir; gmake
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'libmysql_r/Makefile.am'
--- a/libmysql_r/Makefile.am 2008-04-25 23:09:48 +0000
+++ b/libmysql_r/Makefile.am 2009-01-07 10:58:33 +0000
@@ -24,7 +24,7 @@
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
$(openssl_includes) @ZLIB_INCLUDES@
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared
@@ -42,6 +42,3 @@
done; \
done
echo timestamp > link_sources
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/libmysqld/Makefile.am 2009-01-07 10:58:33 +0000
@@ -31,7 +31,7 @@
@DEFS@ \
-DLIBDIR="\"$(MYSQLLIBdir)\"" \
-DPLUGINDIR="\"$(pkgplugindir)\""
-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
@@ -240,6 +240,3 @@
clean-local:
rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlstoragesources) $(storagesources) | sed "s;\.lo;.c;g"`; \
rm -f client_settings.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am 2008-08-08 09:40:47 +0000
+++ b/libmysqld/examples/Makefile.am 2009-01-07 10:58:33 +0000
@@ -33,8 +33,8 @@
echo timestamp > link_sources
DEFS = -DEMBEDDED_LIBRARY @DEFS@
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
- -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/client -I$(top_srcdir)/regex \
$(openssl_includes)
LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(top_srcdir)/libmysqld/libmysqld.a \
@@ -51,6 +51,3 @@
mysql_client_test_embedded_LINK = $(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'man/Makefile.am'
--- a/man/Makefile.am 2008-08-27 14:03:39 +0000
+++ b/man/Makefile.am 2009-01-07 10:58:33 +0000
@@ -24,6 +24,3 @@
# "make_win_*" are not needed in Unix binary packages,
install-data-hook:
rm -f $(DESTDIR)$(manlibdir)/man1/make_win_*
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/mysql-test/Makefile.am 2009-01-07 10:58:33 +0000
@@ -29,7 +29,7 @@
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
CLEANFILES = $(GENSCRIPTS)
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
+AM_CPPFLAGS = -I$(top_srcdir)/include
dist-hook:
@@ -87,7 +87,7 @@
$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(distdir)/std_data/funcs_1
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(distdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(distdir)/lib/My
- -rm -rf `find $(distdir)/suite -type d -name SCCS` $(distdir)/suite/row_lock
+ -rm -rf $(distdir)/suite/row_lock
install-data-local:
$(mkinstalldirs) \
@@ -149,7 +149,7 @@
$(INSTALL_DATA) $(srcdir)/std_data/funcs_1/*.txt $(DESTDIR)$(testdir)/std_data/funcs_1
$(INSTALL_DATA) $(srcdir)/lib/*.pl $(DESTDIR)$(testdir)/lib
$(INSTALL_DATA) $(srcdir)/lib/My/*.pm $(DESTDIR)$(testdir)/lib/My
- for f in `(cd $(srcdir); find suite -type f | egrep -v 'SCCS|row_lock')`; \
+ for f in `(cd $(srcdir); find suite -type f | grep -v 'row_lock')`; \
do \
d=$(DESTDIR)$(testdir)/`dirname $$f`; \
mkdir -p $$d ; \
@@ -194,6 +194,3 @@
$< > $@-t
@CHMOD@ +x $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'mysql-test/ndb/Makefile.am'
--- a/mysql-test/ndb/Makefile.am 2006-04-12 12:08:24 +0000
+++ b/mysql-test/ndb/Makefile.am 2009-01-07 10:58:33 +0000
@@ -18,6 +18,3 @@
$< > $@-t
@CHMOD@ +x $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'mysys/Makefile.am'
--- a/mysys/Makefile.am 2008-12-14 11:36:15 +0000
+++ b/mysys/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,8 +16,8 @@
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
-INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
- -I$(top_srcdir)/include -I$(srcdir)
+AM_CPPFLAGS = @ZLIB_INCLUDES@ \
+ -I$(top_srcdir)/include
LDADD = $(top_builddir)/strings/libmystringslt.la \
$(top_builddir)/dbug/libdbuglt.la @ZLIB_LIBS@
@@ -87,6 +87,3 @@
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
@DEFS@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'mysys/tests/Makefile.am'
--- a/mysys/tests/Makefile.am 2008-12-13 20:48:00 +0000
+++ b/mysys/tests/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,8 +16,8 @@
MYSQLDATAdir = $(localstatedir)
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
-INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
- -I$(top_srcdir)/include -I$(srcdir) \
+AM_CPPFLAGS = @ZLIB_INCLUDES@ \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/mysys
LDADD = $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la $(top_builddir)/dbug/libdbug.la
@@ -39,7 +39,7 @@
test_base64$(EXEEXT) test_thr_mutex$(EXEEXT)
# I hope this always does the right thing. Otherwise this is only test programs
-FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+FLAGS=$(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
noinst_PROGRAMS = test_bitmap test_priority_queue test_thr_alarm test_thr_lock test_vsnprintf test_io_cache testhash test_gethwaddr test_base64 test_thr_mutex #test_charset
test_bitmap_SOURCES = $(top_srcdir)/mysys/my_bitmap.c
@@ -55,6 +55,3 @@
test_base64_SOURCES = $(top_srcdir)/mysys/base64.c
test_base64_LDADD = $(top_builddir)/mysys/libmysyslt.la $(top_builddir)/strings/libmystrings.la
test_thr_mutex_SOURCES = test_thr_mutex.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'netware/Makefile.am'
--- a/netware/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/netware/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,7 +15,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
if HAVE_NETWARE
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
+AM_CPPFLAGS = -I$(top_srcdir)/include
LDADD = @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
@@ -117,6 +117,3 @@
@echo "Building $@";
@cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@;
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'plugin/Makefile.am'
--- a/plugin/Makefile.am 2008-03-28 10:53:03 +0000
+++ b/plugin/Makefile.am 2009-01-07 10:58:33 +0000
@@ -23,6 +23,3 @@
SUBDIRS = @mysql_pg_dirs@
DIST_SUBDIRS = audit_null daemon_example fulltext
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'plugin/audit_null/Makefile.am'
--- a/plugin/audit_null/Makefile.am 2009-01-10 12:13:21 +0000
+++ b/plugin/audit_null/Makefile.am 2009-01-12 15:00:34 +0000
@@ -17,20 +17,16 @@
pkgplugindir= $(pkglibdir)/plugin
-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
EXTRA_LTLIBRARIES= adt_null.la
pkgplugin_LTLIBRARIES= @plugin_audit_null_shared_target@
adt_null_la_LDFLAGS= -module -rpath $(pkgplugindir)
-adt_null_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+adt_null_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
adt_null_la_SOURCES= audit_null.c
EXTRA_LIBRARIES= libadtnull.a
noinst_LIBRARIES= @plugin_audit_null_static_target@
-libadtnull_a_CFLAGS= $(AM_CFLAGS)
libadtnull_a_SOURCES= audit_null.c
EXTRA_DIST= plug.in
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'plugin/daemon_example/Makefile.am'
--- a/plugin/daemon_example/Makefile.am 2008-01-02 13:00:46 +0000
+++ b/plugin/daemon_example/Makefile.am 2009-01-07 10:58:33 +0000
@@ -19,24 +19,18 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \
- -I$(srcdir) @ZLIB_INCLUDES@
+ @ZLIB_INCLUDES@
EXTRA_LTLIBRARIES = libdaemon_example.la
pkgplugin_LTLIBRARIES = @plugin_daemon_example_shared_target@
libdaemon_example_la_LDFLAGS = -module -rpath $(pkgplugindir)
-libdaemon_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-libdaemon_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+libdaemon_example_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
libdaemon_example_la_SOURCES = daemon_example.cc
EXTRA_LIBRARIES = libdaemon_example.a
noinst_LIBRARIES = @plugin_daemon_example_static_target@
-libdaemon_example_a_CXXFLAGS = $(AM_CFLAGS)
-libdaemon_example_a_CFLAGS = $(AM_CFLAGS)
libdaemon_example_a_SOURCES= daemon_example.cc
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'plugin/fulltext/Makefile.am'
--- a/plugin/fulltext/Makefile.am 2008-01-02 13:00:46 +0000
+++ b/plugin/fulltext/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,12 +16,9 @@
#Makefile.am example for a plugin
pkgplugindir=$(pkglibdir)/plugin
-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
#noinst_LTLIBRARIES= mypluglib.la
pkgplugin_LTLIBRARIES= mypluglib.la
mypluglib_la_SOURCES= plugin_example.c
mypluglib_la_LDFLAGS= -module -rpath $(pkgplugindir)
mypluglib_la_CFLAGS= -DMYSQL_DYNAMIC_PLUGIN
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'pstack/Makefile.am'
--- a/pstack/Makefile.am 2007-09-27 19:39:23 +0000
+++ b/pstack/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,13 +20,10 @@
SUBDIRS = aout
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
pkglib_LIBRARIES = libpstack.a
libpstack_a_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c \
debug.c ieee.c pstack.c stabs.c
noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \
linuxthreads.h pstack.h pstacktrace.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'pstack/aout/Makefile.am'
--- a/pstack/aout/Makefile.am 2006-12-31 00:02:27 +0000
+++ b/pstack/aout/Makefile.am 2009-01-07 10:58:33 +0000
@@ -1,4 +1,1 @@
noinst_HEADERS = aout64.h stab.def stab_gnu.h
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'regex/Makefile.am'
--- a/regex/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/regex/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,7 +15,7 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libregex.a
LDADD= libregex.a $(top_builddir)/strings/libmystrings.la
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h
@@ -31,6 +31,3 @@
./re < tests
./re -el < tests
./re -er < tests
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am 2008-12-14 11:36:15 +0000
+++ b/scripts/Makefile.am 2009-01-07 10:58:33 +0000
@@ -194,6 +194,3 @@
@CHMOD@ +x $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'sql-bench/Makefile.am'
--- a/sql-bench/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/sql-bench/Makefile.am 2009-01-07 10:58:33 +0000
@@ -81,6 +81,3 @@
$< > $@-t
@CHMOD@ +x $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'sql-common/Makefile.am'
--- a/sql-common/Makefile.am 2006-12-31 00:02:27 +0000
+++ b/sql-common/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,6 +15,3 @@
## Process this file with automake to create Makefile.in
EXTRA_DIST = client.c pack.c my_time.c my_user.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am 2008-12-14 11:36:15 +0000
+++ b/sql/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,9 +20,9 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = @ZLIB_INCLUDES@ \
- -I$(top_builddir)/include -I$(top_srcdir)/include \
- -I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes) \
+AM_CPPFLAGS = @ZLIB_INCLUDES@ \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/regex $(openssl_includes) \
$(libevent_includes)
WRAPLIBS= @WRAPLIBS@
SUBDIRS = share backup
@@ -159,7 +159,7 @@
nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c
-libndb_la_CPPFLAGS= @ndbcluster_includes@
+libndb_la_CPPFLAGS= @ndbcluster_includes@ $(AM_CPPFLAGS)
libndb_la_SOURCES= ha_ndbcluster.cc \
ha_ndbcluster_binlog.cc \
ha_ndbcluster_connection.cc \
@@ -238,6 +238,3 @@
$(DTRACE) $(DTRACEFLAGS) -G -s $< $(DTRACEFILES)
probes.o : $(DTRACEFILES)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'sql/backup/Makefile.am'
--- a/sql/backup/Makefile.am 2008-08-27 17:30:49 +0000
+++ b/sql/backup/Makefile.am 2009-01-07 10:58:33 +0000
@@ -19,9 +19,8 @@
noinst_LTLIBRARIES = libbackup.la libbackupstream.la
-INCLUDES = \
+AM_CPPFLAGS = \
@ZLIB_INCLUDES@ \
- -I$(top_builddir)/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/sql \
-I$(top_srcdir)/regex
@@ -79,6 +78,3 @@
@DEFS@
EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'sql/share/Makefile.am'
--- a/sql/share/Makefile.am 2006-12-23 19:17:15 +0000
+++ b/sql/share/Makefile.am 2009-01-07 10:58:33 +0000
@@ -57,6 +57,3 @@
# Do nothing
link_sources:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/Makefile.am'
--- a/storage/Makefile.am 2007-12-13 12:28:35 +0000
+++ b/storage/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,6 +20,3 @@
# These are built from source in the Docs directory
EXTRA_DIST =
SUBDIRS = @mysql_se_dirs@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/archive/Makefile.am'
--- a/storage/archive/Makefile.am 2009-01-10 12:31:35 +0000
+++ b/storage/archive/Makefile.am 2009-01-12 15:00:34 +0000
@@ -22,14 +22,14 @@
endif
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -DHAVE_MYSQL_CONFIG_H \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
-I$(top_srcdir)/sql \
- -I$(srcdir) @ZLIB_INCLUDES@
+ @ZLIB_INCLUDES@
WRAPLIBS=
LDADD =
-AM_CFLAGS = -DHAVE_MYSQL_CONFIG_H
DEFS = @DEFS@
@@ -39,19 +39,15 @@
EXTRA_LTLIBRARIES = ha_archive.la
pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@
ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) $(LDADD)
-ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_archive_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_archive_la_SOURCES = ha_archive.cc azio.c
EXTRA_LIBRARIES = libarchive.a
noinst_LIBRARIES = @plugin_archive_static_target@
-libarchive_a_CXXFLAGS = $(AM_CFLAGS)
-libarchive_a_CFLAGS = $(AM_CFLAGS)
libarchive_a_SOURCES = ha_archive.cc azio.c
archive_performance_SOURCES = archive_performance.c azio.c
-archive_performance_CFLAGS = $(AM_CFLAGS)
archive_performance_LDADD = $(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la \
@@ -60,7 +56,6 @@
archive_performance_LDFLAGS = @NOINST_LDFLAGS@
archive_test_SOURCES = archive_test.c azio.c
-archive_test_CFLAGS = $(AM_CFLAGS)
archive_test_LDADD = $(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la \
@@ -69,7 +64,6 @@
archive_test_LDFLAGS = @NOINST_LDFLAGS@
archive_reader_SOURCES = archive_reader.c azio.c
-archive_reader_CFLAGS = $(AM_CFLAGS)
archive_reader_LDADD = $(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la \
@@ -78,7 +72,6 @@
archive_reader_LDFLAGS = @NOINST_LDFLAGS@
concurrency_test_SOURCES = concurrency_test.c azio.c
-concurrency_test_CFLAGS = $(AM_CFLAGS)
concurrency_test_LDADD = $(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la \
@@ -93,5 +86,3 @@
libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes ./archive_performance
EXTRA_DIST = CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/blackhole/Makefile.am'
--- a/storage/blackhole/Makefile.am 2008-01-02 13:00:46 +0000
+++ b/storage/blackhole/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,10 +20,9 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -35,18 +34,13 @@
EXTRA_LTLIBRARIES = ha_blackhole.la
pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@
ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
-ha_blackhole_la_CXXFLAGS=$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_blackhole_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_blackhole_la_CPPFLAGS=$(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_blackhole_la_SOURCES=ha_blackhole.cc
EXTRA_LIBRARIES = libblackhole.a
noinst_LIBRARIES = @plugin_blackhole_static_target@
-libblackhole_a_CXXFLAGS=$(AM_CFLAGS)
-libblackhole_a_CFLAGS = $(AM_CFLAGS)
libblackhole_a_SOURCES= ha_blackhole.cc
EXTRA_DIST = CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/csv/Makefile.am'
--- a/storage/csv/Makefile.am 2009-01-10 12:31:35 +0000
+++ b/storage/csv/Makefile.am 2009-01-12 15:00:34 +0000
@@ -17,11 +17,9 @@
pkgplugindir= $(pkglibdir)/plugin
-INCLUDES = -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
LDADD =
DEFS = @DEFS@
@@ -30,14 +28,11 @@
EXTRA_LTLIBRARIES = ha_csv.la
pkgplugin_LTLIBRARIES = @plugin_csv_shared_target@
ha_csv_la_LDFLAGS = -module -rpath $(pkgplugindir)
-ha_csv_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_PLUGIN
+ha_csv_la_CPPFLAGS = $(AM_CPPFLAGS) -DMYSQL_PLUGIN
ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_LIBRARIES = libcsv.a
noinst_LIBRARIES = @plugin_csv_static_target@
-libcsv_a_CXXFLAGS = $(AM_CFLAGS)
libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
EXTRA_DIST = CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/example/Makefile.am'
--- a/storage/example/Makefile.am 2008-01-02 13:00:46 +0000
+++ b/storage/example/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,10 +20,9 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -35,18 +34,13 @@
EXTRA_LTLIBRARIES = ha_example.la
pkgplugin_LTLIBRARIES = @plugin_example_shared_target@
ha_example_la_LDFLAGS = -module -rpath $(pkgplugindir)
-ha_example_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_example_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_example_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_example_la_SOURCES = ha_example.cc
EXTRA_LIBRARIES = libexample.a
noinst_LIBRARIES = @plugin_example_static_target@
-libexample_a_CXXFLAGS = $(AM_CFLAGS)
-libexample_a_CFLAGS = $(AM_CFLAGS)
libexample_a_SOURCES= ha_example.cc
EXTRA_DIST = CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/falcon/Makefile.am'
--- a/storage/falcon/Makefile.am 2009-01-10 12:31:35 +0000
+++ b/storage/falcon/Makefile.am 2009-01-12 15:00:34 +0000
@@ -23,8 +23,8 @@
pkgplugindir= $(pkglibdir)/plugin
-INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
- -I$(top_srcdir)/regex -I$(top_srcdir)/sql -I$(srcdir) \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/regex -I$(top_srcdir)/sql \
-I$(srcdir)/TransformLib @ZLIB_INCLUDES@ @FALCON_SPARC_ASSEMBLY@
falcon_headers= Agent.h Alias.h Application.h \
@@ -398,7 +398,7 @@
EXTRA_LTLIBRARIES= ha_falcon.la
pkgplugin_LTLIBRARIES= @plugin_falcon_shared_target@
ha_falcon_la_LDFLAGS= -module -rpath $(pkgplugindir)
-ha_falcon_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_falcon_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_LIBADD= TransformLib/libtransform.la
ha_falcon_la_SOURCES= $(falcon_sources)
@@ -412,8 +412,6 @@
noinst_LIBRARIES= @plugin_falcon_static_target@
libfalcon_a_LIBADD= libhafalcon.a TransformLib/libtransform.a
libfalcon_a_SOURCES=
-libhafalcon_a_CXXFLAGS= $(AM_CXXFLAGS)
-libhafalcon_a_CFLAGS= $(AM_CFLAGS)
libhafalcon_a_SOURCES= $(falcon_sources)
libfalcon.a: $(libfalcon_a_LIBADD)
@@ -443,6 +441,3 @@
$(DTRACE) $(DTRACEFLAGS) -G -s falcon_probes.d $(DTRACEFILES)
CLEANFILES= libhafalcon.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/falcon/TransformLib/Makefile.am'
--- a/storage/falcon/TransformLib/Makefile.am 2008-07-08 16:01:41 +0000
+++ b/storage/falcon/TransformLib/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,7 +16,7 @@
# Re-enable implicit templates and exceptions
MYSQL_EXTRA_CXXFLAGS = @FALCON_CXXFLAGS@
-INCLUDES= -I$(srcdir)/.. @ZLIB_INCLUDES@
+AM_CPPFLAGS = -I$(srcdir)/.. @ZLIB_INCLUDES@
transform_sources= Base64Transform.cpp BERDecode.cpp BERException.cpp \
FileTransform.cpp HexTransform.cpp NullTransform.cpp \
@@ -37,10 +37,8 @@
noinst_LIBRARIES= libtransform.a
noinst_HEADERS= $(transform_headers)
-libtransform_la_CXXFLAGS= $(AM_CXXFLAGS) $(INCLUDES)
+# Work around for "created both with libtool and without" error.
+# See http://www.gnu.org/software/automake/manual/html_node/Libtool-Issues.html
+libtransform_la_CXXFLAGS= $(AM_CXXFLAGS)
libtransform_la_SOURCES= $(transform_sources)
-libtransform_a_CXXFLAGS= $(AM_CXXFLAGS) $(INCLUDES)
-libtransform_a_SOURCES= $(transform_sources)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
+libtransform_a_SOURCES= $(transform_sources)
=== modified file 'storage/falcon/plug.in'
--- a/storage/falcon/plug.in 2008-12-04 22:00:04 +0000
+++ b/storage/falcon/plug.in 2009-01-09 11:46:26 +0000
@@ -16,12 +16,13 @@
x86_64) falcon_cv_supported_by_machine="yes" ;;
powerpc)falcon_cv_supported_by_machine="yes" ;;
sparc)
- AC_TRY_LINK([
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[
#include <stdlib.h>
volatile int target= 0;
int compare= 1;
int exchange= 2;
- ],[
+ ]],[[
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
/* When compiling with Sun Studio compiler we use the Solaris atomic
functions if they are available. These were first introduced in
@@ -57,8 +58,9 @@
: "memory", "cc"
)
#endif /* !__SUNPRO_C && !__SUNPRO_CC */
- ], falcon_cv_supported_by_machine="yes",
- falcon_cv_supported_by_machine="no")
+ ]])],
+ [falcon_cv_supported_by_machine="yes"],
+ [falcon_cv_supported_by_machine="no"])
;;
*) falcon_cv_supported_by_machine="no" ;;
esac
@@ -130,8 +132,8 @@
CXXFLAGS=$FALCON_CXXFLAGS
AC_CACHE_CHECK([if compiler and compiler options support C++ exceptions for Falcon],
falcon_cv_supported_by_compiler,[
- AC_TRY_RUN([
- int main() {
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM([],[[
try {
throw 1;
}
@@ -139,9 +141,10 @@
return 0;
}
return -1;
- }
- ], falcon_cv_supported_by_compiler="yes",
- falcon_cv_supported_by_compiler="no", )
+ ]])],
+ [falcon_cv_supported_by_compiler="yes"],
+ [falcon_cv_supported_by_compiler="no"],
+ [falcon_cv_supported_by_compiler="yes"]) dnl For cross compiling, assume it works
])
if test "$falcon_cv_supported_by_compiler" != "yes"; then
=== modified file 'storage/federated/Makefile.am'
--- a/storage/federated/Makefile.am 2008-01-02 13:00:46 +0000
+++ b/storage/federated/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,10 +20,9 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir = $(pkglibdir)/plugin
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -35,18 +34,13 @@
EXTRA_LTLIBRARIES = ha_federated.la
pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir)
-ha_federated_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
-ha_federated_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ha_federated_la_CPPFLAGS= $(AM_CPPFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_federated_la_SOURCES = ha_federated.cc
EXTRA_LIBRARIES = libfederated.a
noinst_LIBRARIES = @plugin_federated_static_target@
-libfederated_a_CXXFLAGS = $(AM_CFLAGS)
-libfederated_a_CFLAGS = $(AM_CFLAGS)
libfederated_a_SOURCES= ha_federated.cc
EXTRA_DIST = CMakeLists.txt plug.in
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/heap/Makefile.am'
--- a/storage/heap/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/heap/Makefile.am 2009-01-07 10:58:33 +0000
@@ -17,10 +17,9 @@
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -50,6 +49,3 @@
EXTRA_DIST = CMakeLists.txt plug.in
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/innobase/Makefile.am'
--- a/storage/innobase/Makefile.am 2008-08-16 05:15:49 +0000
+++ b/storage/innobase/Makefile.am 2009-01-07 10:58:33 +0000
@@ -20,11 +20,10 @@
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
pkgplugindir= $(pkglibdir)/plugin
-INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
-I$(top_srcdir)/storage/innobase/include \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
DEFS= @DEFS@
@@ -155,20 +154,13 @@
ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \
handler/ha_innodb.cc
-libinnobase_a_CXXFLAGS= $(AM_CFLAGS)
-libinnobase_a_CFLAGS= $(AM_CFLAGS)
-
EXTRA_LTLIBRARIES= ha_innodb.la
pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@
ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)
-ha_innodb_la_CXXFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_la_CFLAGS= $(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CPPFLAGS= $(AM_CPPFLAGS) $(INNODB_DYNAMIC_CFLAGS)
ha_innodb_la_SOURCES= $(libinnobase_a_SOURCES)
EXTRA_DIST= CMakeLists.txt plug.in \
pars/make_bison.sh pars/make_flex.sh \
pars/pars0grm.y pars/pars0lex.l
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/maria/Makefile.am'
--- a/storage/maria/Makefile.am 2008-08-16 05:15:49 +0000
+++ b/storage/maria/Makefile.am 2009-01-07 10:58:33 +0000
@@ -17,10 +17,9 @@
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -64,7 +63,7 @@
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la @ZLIB_LIBS@
maria_dump_log_SOURCES= ma_loghandler.c unittest/ma_loghandler_examples.c
-maria_dump_log_CPPFLAGS= -DMARIA_DUMP_LOG
+maria_dump_log_CPPFLAGS= $(AM_CPPFLAGS) -DMARIA_DUMP_LOG
noinst_PROGRAMS = ma_test1 ma_test2 ma_test3 ma_rt_test ma_sp_test
noinst_HEADERS = maria_def.h ma_rt_index.h ma_rt_key.h ma_rt_mbr.h \
ma_sp_defs.h ma_fulltext.h ma_ftdefs.h ma_ft_test1.h \
@@ -192,6 +191,3 @@
test-verbose:
HARNESS_VERBOSE=1 perl $(top_srcdir)/unittest/unit.pl run $(unittests)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/maria/plug.in'
--- a/storage/maria/plug.in 2008-06-05 20:41:50 +0000
+++ b/storage/maria/plug.in 2009-01-09 11:46:26 +0000
@@ -8,7 +8,7 @@
MYSQL_PLUGIN_ACTIONS(maria, [
AC_CONFIG_FILES(storage/maria/unittest/Makefile)
AC_ARG_WITH(maria-tmp-tables,
- AC_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]),
+ AS_HELP_STRING([--with-maria-tmp-tables],[Use Maria for internal temporary tables]),
[with_maria_tmp_tables=$withval],
[with_maria_tmp_tables=yes]
)
=== modified file 'storage/maria/unittest/Makefile.am'
--- a/storage/maria/unittest/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/storage/maria/unittest/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,9 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
- -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
-INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+AM_CPPFLAGS = @ZLIB_INCLUDES@ \
-I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
EXTRA_DIST= ma_test_all-t CMakeLists.txt \
ma_test_recovery.pl ma_test_recovery.expected
@@ -57,21 +55,21 @@
ma_test_loghandler_multigroup_t_SOURCES = ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c sequence_storage.h
ma_test_loghandler_multithread_t_SOURCES = ma_test_loghandler_multithread-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_multiflush_t_SOURCES = ma_test_loghandler_multithread-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_multiflush_t_CPPFLAGS = -DMULTIFLUSH_TEST
+ma_test_loghandler_multiflush_t_CPPFLAGS = -DMULTIFLUSH_TEST $(AM_CPPFLAGS)
ma_test_loghandler_pagecache_t_SOURCES = ma_test_loghandler_pagecache-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_long_t_SOURCES = ma_test_loghandler-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
-ma_test_loghandler_long_t_CPPFLAGS = -DLONG_LOG_TEST
+ma_test_loghandler_long_t_CPPFLAGS = -DLONG_LOG_TEST $(AM_CPPFLAGS)
ma_test_loghandler_noflush_t_SOURCES = ma_test_loghandler_noflush-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_first_lsn_t_SOURCES = ma_test_loghandler_first_lsn-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_max_lsn_t_SOURCES = ma_test_loghandler_max_lsn-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_purge_t_SOURCES = ma_test_loghandler_purge-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_test_loghandler_readonly_t_SOURCES = ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c sequence_storage.h
-ma_test_loghandler_readonly_t_CPPFLAGS = -DREADONLY_TEST
+ma_test_loghandler_readonly_t_CPPFLAGS = -DREADONLY_TEST $(AM_CPPFLAGS)
ma_test_loghandler_nologs_t_SOURCES = ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c
ma_pagecache_single_src = ma_pagecache_single.c test_file.c test_file.h
ma_pagecache_consist_src = ma_pagecache_consist.c test_file.c test_file.h
-ma_pagecache_common_cppflags = -DEXTRA_DEBUG -DPAGECACHE_DEBUG -DMAIN
+ma_pagecache_common_cppflags = -DEXTRA_DEBUG -DPAGECACHE_DEBUG -DMAIN $(AM_CPPFLAGS)
ma_pagecache_single_1k_t_SOURCES = $(ma_pagecache_single_src)
ma_pagecache_single_8k_t_SOURCES = $(ma_pagecache_single_src)
@@ -101,15 +99,12 @@
ma_pagecache_consist_64kWR_t_CPPFLAGS = $(ma_pagecache_common_cppflags) -DTEST_PAGE_SIZE=65536 -DTEST_WRITERS
ma_pagecache_rwconsist_1k_t_SOURCES = ma_pagecache_rwconsist.c
-ma_pagecache_rwconsist_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
+ma_pagecache_rwconsist_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 $(AM_CPPFLAGS)
ma_pagecache_rwconsist2_1k_t_SOURCES = ma_pagecache_rwconsist2.c
-ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024
+ma_pagecache_rwconsist2_1k_t_CPPFLAGS = -DTEST_PAGE_SIZE=1024 $(AM_CPPFLAGS)
# the generic lock manager may not be used in the end and lockman1-t crashes,
# and lockman2-t takes at least quarter an hour,
# so we don't build lockman-t and lockman1-t and lockman2-t
CLEANFILES = maria_log_control page_cache_test_file_1 \
maria_log.????????
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/myisam/Makefile.am'
--- a/storage/myisam/Makefile.am 2008-08-16 05:15:49 +0000
+++ b/storage/myisam/Makefile.am 2009-01-07 10:58:33 +0000
@@ -17,10 +17,9 @@
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -150,6 +149,3 @@
$< > $@-t
@CHMOD@ +x $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/myisammrg/Makefile.am'
--- a/storage/myisammrg/Makefile.am 2008-04-25 21:45:58 +0000
+++ b/storage/myisammrg/Makefile.am 2009-01-07 10:58:33 +0000
@@ -17,10 +17,9 @@
MYSQLSHAREdir = $(pkgdatadir)
MYSQLBASEdir= $(prefix)
MYSQLLIBdir= $(pkglibdir)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \
- -I$(top_srcdir)/sql \
- -I$(srcdir)
+ -I$(top_srcdir)/sql
WRAPLIBS=
LDADD =
@@ -39,6 +38,3 @@
EXTRA_DIST = CMakeLists.txt plug.in
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/Makefile.am'
--- a/storage/ndb/Makefile.am 2008-03-11 15:27:35 +0000
+++ b/storage/ndb/Makefile.am 2009-01-07 10:58:33 +0000
@@ -21,7 +21,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
dist-hook:
- -rm -rf `find $(distdir) -type d -name SCCS`
-rm -rf `find $(distdir)/ndbapi-examples -name '*.o'`
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" != "." -a "$$subdir" != "include"; then \
@@ -41,9 +40,6 @@
windoze-dsp:
all-windoze-dsp: windoze
- find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
+ find . -name '*.dsp' | xargs unix2dos
$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
- tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
+ tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp'`
=== modified file 'storage/ndb/config/common.mk.am'
--- a/storage/ndb/config/common.mk.am 2008-03-11 15:27:35 +0000
+++ b/storage/ndb/config/common.mk.am 2009-01-07 10:58:33 +0000
@@ -22,7 +22,7 @@
ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"
mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi"
-INCLUDES = $(INCLUDES_LOC)
+AM_CPPFLAGS = $(INCLUDES_LOC)
LDADD = $(LDADD_LOC)
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
=== modified file 'storage/ndb/config/type_kernel.mk.am'
--- a/storage/ndb/config/type_kernel.mk.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_kernel.mk.am 2009-01-07 10:58:33 +0000
@@ -13,9 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES += \
- -I$(srcdir) \
- -I$(top_builddir)/include \
+AM_CPPFLAGS += \
-I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
=== modified file 'storage/ndb/config/type_mgmapiclient.mk.am'
--- a/storage/ndb/config/type_mgmapiclient.mk.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_mgmapiclient.mk.am 2009-01-07 10:58:33 +0000
@@ -13,4 +13,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi
+AM_CPPFLAGS += -I$(top_srcdir)/storage/ndb/include/mgmapi
=== modified file 'storage/ndb/config/type_ndbapi.mk.am'
--- a/storage/ndb/config/type_ndbapi.mk.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_ndbapi.mk.am 2009-01-07 10:58:33 +0000
@@ -13,9 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES += \
- -I$(srcdir) \
- -I$(top_builddir)/include \
+AM_CPPFLAGS += \
-I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
=== modified file 'storage/ndb/config/type_ndbapiclient.mk.am'
--- a/storage/ndb/config/type_ndbapiclient.mk.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_ndbapiclient.mk.am 2009-01-07 10:58:33 +0000
@@ -13,4 +13,4 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES += -I$(top_srcdir)/storage/ndb/include/ndbapi
+AM_CPPFLAGS += -I$(top_srcdir)/storage/ndb/include/ndbapi
=== modified file 'storage/ndb/config/type_ndbapitest.mk.am'
--- a/storage/ndb/config/type_ndbapitest.mk.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/config/type_ndbapitest.mk.am 2009-01-07 10:58:33 +0000
@@ -19,8 +19,7 @@
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@
-INCLUDES += -I$(top_srcdir) \
- -I$(top_builddir)/include \
+AM_CPPFLAGS += \
-I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
=== modified file 'storage/ndb/config/type_ndbapitools.mk.am'
--- a/storage/ndb/config/type_ndbapitools.mk.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/config/type_ndbapitools.mk.am 2009-01-07 10:58:33 +0000
@@ -19,8 +19,7 @@
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la @NDB_SCI_LIBS@ @ZLIB_LIBS@
-INCLUDES += -I$(srcdir) \
- -I$(top_builddir)/include \
+AM_CPPFLAGS += \
-I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/storage/ndb/include \
=== modified file 'storage/ndb/config/type_util.mk.am'
--- a/storage/ndb/config/type_util.mk.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/config/type_util.mk.am 2009-01-07 10:58:33 +0000
@@ -13,8 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES += -I$(srcdir) \
- -I$(top_builddir)/include \
+AM_CPPFLAGS += \
-I$(top_builddir)/storage/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mysys \
=== modified file 'storage/ndb/docs/Makefile.am'
--- a/storage/ndb/docs/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/docs/Makefile.am 2009-01-07 10:58:33 +0000
@@ -127,6 +127,3 @@
cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am 2007-06-14 10:58:03 +0000
+++ b/storage/ndb/include/Makefile.am 2009-01-07 10:58:33 +0000
@@ -60,10 +60,4 @@
EXTRA_DIST = debugger editline kernel logger mgmcommon \
portlib transporter util
-dist-hook:
- -rm -rf `find $(distdir) -type d -name SCCS`
-
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/Makefile.am'
--- a/storage/ndb/src/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/Makefile.am 2009-01-07 10:58:33 +0000
@@ -47,10 +47,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
@touch dummy.cpp
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/common/Makefile.am'
--- a/storage/ndb/src/common/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/Makefile.am 2009-01-07 10:58:33 +0000
@@ -28,6 +28,3 @@
util/libgeneral.la
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/common/debugger/Makefile.am'
--- a/storage/ndb/src/common/debugger/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/debugger/Makefile.am 2009-01-07 10:58:33 +0000
@@ -22,9 +22,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libtrace.dsp
libtrace.dsp: Makefile \
@@ -35,6 +32,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/common/debugger/signaldata/Makefile.am'
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am 2007-05-15 08:53:46 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am 2009-01-07 10:58:33 +0000
@@ -43,9 +43,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libsignaldataprint.dsp
libsignaldataprint.dsp: Makefile \
@@ -56,6 +53,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsignaldataprint_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/common/logger/Makefile.am'
--- a/storage/ndb/src/common/logger/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/logger/Makefile.am 2009-01-07 10:58:33 +0000
@@ -21,9 +21,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
windoze-dsp: liblogger.dsp
liblogger.dsp: Makefile \
@@ -34,6 +31,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(SOURCE_WIN)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/common/mgmcommon/Makefile.am'
--- a/storage/ndb/src/common/mgmcommon/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am 2009-01-07 10:58:33 +0000
@@ -25,9 +25,6 @@
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libmgmsrvcommon.dsp
libmgmsrvcommon.dsp: Makefile \
@@ -38,6 +35,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/common/portlib/Makefile.am'
--- a/storage/ndb/src/common/portlib/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/portlib/Makefile.am 2009-01-07 10:58:33 +0000
@@ -29,7 +29,6 @@
PortLibTest_SOURCES = NdbPortLibTest.cpp
munmaptest_SOURCES = munmaptest.cpp
-# Don't update the files from bitkeeper
WIN_src = win32/NdbCondition.c \
win32/NdbDaemon.c \
win32/NdbEnv.c \
@@ -51,9 +50,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/common/transporter/Makefile.am'
--- a/storage/ndb/src/common/transporter/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/transporter/Makefile.am 2009-01-07 10:58:33 +0000
@@ -32,9 +32,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libtransporter.dsp
libtransporter.dsp: Makefile \
@@ -45,6 +42,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/common/transporter/TransporterRegistry.cpp'
--- a/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2008-08-27 19:56:41 +0000
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp 2009-01-09 11:46:26 +0000
@@ -1295,7 +1295,7 @@
#ifdef NDB_SHM_TRANSPORTER
static
-RETSIGTYPE
+void
shm_sig_handler(int signo)
{
g_shm_counter++;
=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am 2008-11-20 14:26:32 +0000
+++ b/storage/ndb/src/common/util/Makefile.am 2009-01-07 10:58:33 +0000
@@ -48,6 +48,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgeneral_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/cw/Makefile.am'
--- a/storage/ndb/src/cw/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/cw/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,6 +16,3 @@
SUBDIRS = cpcd
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/cw/cpcd/Makefile.am'
--- a/storage/ndb/src/cw/cpcd/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/cw/cpcd/Makefile.am 2009-01-07 10:58:33 +0000
@@ -28,7 +28,4 @@
ndb_cpcd_LDFLAGS = -static @ndb_bin_am_ldflags@
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp:
=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am 2008-04-25 23:09:48 +0000
+++ b/storage/ndb/src/kernel/Makefile.am 2009-01-07 10:58:33 +0000
@@ -23,7 +23,7 @@
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-INCLUDES += \
+AM_CPPFLAGS += \
-I$(srcdir)/blocks/cmvmi \
-I$(srcdir)/blocks/dbacc \
-I$(srcdir)/blocks/dbdict \
@@ -68,9 +68,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am 2009-01-07 10:58:33 +0000
@@ -64,10 +64,4 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/blocks/backup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am 2009-01-07 10:58:33 +0000
@@ -24,6 +24,3 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2009-01-07 10:58:33 +0000
@@ -30,6 +30,3 @@
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2009-01-07 10:58:33 +0000
@@ -24,6 +24,3 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2009-01-07 10:58:33 +0000
@@ -26,6 +26,3 @@
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/strings/libmystringslt.la
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2009-01-07 10:58:33 +0000
@@ -23,6 +23,3 @@
$(top_builddir)/mysys/libmysyslt.la \
$(top_builddir)/dbug/libdbuglt.la \
$(top_builddir)/strings/libmystringslt.la
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/src/kernel/error/Makefile.am'
--- a/storage/ndb/src/kernel/error/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/error/Makefile.am 2009-01-07 10:58:33 +0000
@@ -22,9 +22,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: liberror.dsp
liberror.dsp: Makefile \
@@ -35,6 +32,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(liberror_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am 2009-01-07 10:58:33 +0000
@@ -43,9 +43,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libkernel.dsp
libkernel.dsp: Makefile \
@@ -56,7 +53,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/mgmapi/Makefile.am'
--- a/storage/ndb/src/mgmapi/Makefile.am 2007-04-13 09:33:08 +0000
+++ b/storage/ndb/src/mgmapi/Makefile.am 2009-01-07 10:58:33 +0000
@@ -29,9 +29,6 @@
#ndbtest_PROGRAMS = ndb_test_mgmapi
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libmgmapi.dsp
libmgmapi.dsp: Makefile \
@@ -42,6 +39,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am 2009-01-07 10:58:33 +0000
@@ -30,7 +30,7 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
-INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
+AM_CPPFLAGS += -I$(top_srcdir)/storage/ndb/include/mgmapi \
-I$(top_srcdir)/storage/ndb/src/common/mgmcommon
LDADD_LOC = $(noinst_LTLIBRARIES) \
@@ -44,9 +44,6 @@
ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
ndb_mgm.dsp: Makefile \
@@ -57,7 +54,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -69,6 +66,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am 2009-01-07 10:58:33 +0000
@@ -57,9 +57,6 @@
ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: ndb_mgmd.dsp
ndb_mgmd.dsp: Makefile \
@@ -70,6 +67,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am 2009-01-07 10:58:33 +0000
@@ -73,9 +73,6 @@
$(top_builddir)/strings/libmystringslt.la \
$(top_builddir)/zlib/libzlt.la
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libndbapi.dsp
libndbapi.dsp: Makefile \
@@ -86,6 +83,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
=== modified file 'storage/ndb/swig/Makefile.am'
--- a/storage/ndb/swig/Makefile.am 2008-03-11 15:27:35 +0000
+++ b/storage/ndb/swig/Makefile.am 2009-01-07 10:58:33 +0000
@@ -43,10 +43,4 @@
ndbapi/NdbTransaction.i \
globals.i
-dist-hook:
- -rm -rf `find $(distdir) -type d -name SCCS`
-
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/test/Makefile.am'
--- a/storage/ndb/test/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/Makefile.am 2009-01-07 10:58:33 +0000
@@ -17,10 +17,4 @@
EXTRA_DIST = include
-dist-hook:
- -rm -rf `find $(distdir) -type d -name SCCS`
-
windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'storage/ndb/test/ndbapi/Makefile.am'
--- a/storage/ndb/test/ndbapi/Makefile.am 2008-09-30 08:18:41 +0000
+++ b/storage/ndb/test/ndbapi/Makefile.am 2009-01-07 10:58:33 +0000
@@ -131,18 +131,15 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-NdbRepStress_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/include
+##testDict_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ndb/include/kernel
+##testIndex_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ndb/include/kernel
+##testSystemRestart_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ndb/include/kernel
+##testTransactions_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ndb/include/kernel
+NdbRepStress_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ndb/test/include -I$(top_srcdir)/include
testBackup_LDADD = $(LDADD) bank/libbank.a
testSRBank_LDADD = bank/libbank.a $(LDADD)
NdbRepStress_LDADD = $(LDADD) $(top_builddir)/libmysql_r/libmysqlclient_r.la
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
@@ -156,7 +153,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ flexBench
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -168,7 +165,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testBasic
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -180,7 +177,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -192,7 +189,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -204,7 +201,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ testScan
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
=== modified file 'storage/ndb/test/ndbapi/bank/Makefile.am'
--- a/storage/ndb/test/ndbapi/bank/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am 2009-01-07 10:58:33 +0000
@@ -32,7 +32,4 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp:
=== modified file 'storage/ndb/test/run-test/Makefile.am'
--- a/storage/ndb/test/run-test/Makefile.am 2008-08-23 20:29:50 +0000
+++ b/storage/ndb/test/run-test/Makefile.am 2009-01-07 10:58:33 +0000
@@ -51,7 +51,4 @@
EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT atrt.hpp
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp:
=== modified file 'storage/ndb/test/src/Makefile.am'
--- a/storage/ndb/test/src/Makefile.am 2008-02-21 14:24:09 +0000
+++ b/storage/ndb/test/src/Makefile.am 2009-01-07 10:58:33 +0000
@@ -31,9 +31,6 @@
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: libNDBT.dsp
libNDBT.dsp: Makefile \
@@ -44,6 +41,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am 2007-11-14 12:30:36 +0000
+++ b/storage/ndb/test/tools/Makefile.am 2009-01-07 10:58:33 +0000
@@ -43,7 +43,4 @@
ndb_cpcc_LDADD = $(LDADD)
ndb_cpcc_LDFLAGS = -static
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp:
=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am 2007-04-24 20:43:13 +0000
+++ b/storage/ndb/tools/Makefile.am 2009-01-07 10:58:33 +0000
@@ -75,9 +75,6 @@
ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
ndb_config_LDFLAGS = @ndb_bin_am_ldflags@
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
windoze-dsp: \
ndb_waiter.dsp \
ndb_drop_table.dsp \
@@ -96,7 +93,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_waiter
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -108,7 +105,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_table
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -120,7 +117,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_delete_all
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -132,7 +129,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_desc
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -144,7 +141,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_index
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -156,7 +153,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_show_tables
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -168,7 +165,7 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_all
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
@@ -180,6 +177,6 @@
$(top_srcdir)/storage/ndb/config/win-libraries
cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_count
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(AM_CPPFLAGS)
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
=== modified file 'strings/Makefile.am'
--- a/strings/Makefile.am 2008-08-08 09:40:47 +0000
+++ b/strings/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,7 +15,7 @@
# This file is public domain and comes with NO WARRANTY of any kind
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
pkglib_LTLIBRARIES = libmystrings.la
libmystrings_la_LDFLAGS = -static
libmystrings_la_SOURCES =
@@ -77,19 +77,16 @@
#strtoull.o: @CHARSET_OBJS@
-FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
+FLAGS=$(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
str_test: str_test.c $(noinst_LTLIBRARIES)
- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(noinst_LTLIBRARIES)
+ $(LINK) $(FLAGS) -DMAIN $(AM_CPPFLAGS) $(srcdir)/str_test.c $(LDADD) $(noinst_LTLIBRARIES)
uctypedump: uctypedump.c
- $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c
+ $(LINK) $(AM_CPPFLAGS) $(srcdir)/uctypedump.c
test_decimal$(EXEEXT): decimal.c $(noinst_LTLIBRARIES)
$(CP) $(srcdir)/decimal.c ./test_decimal.c
$(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(noinst_LTLIBRARIES)
$(RM) -f ./test_decimal.c
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
=== modified file 'support-files/MacOSX/Makefile.am'
--- a/support-files/MacOSX/Makefile.am 2008-02-26 17:36:06 +0000
+++ b/support-files/MacOSX/Makefile.am 2009-01-07 10:58:33 +0000
@@ -52,6 +52,3 @@
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
$< > $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'support-files/Makefile.am'
--- a/support-files/Makefile.am 2008-01-24 18:04:48 +0000
+++ b/support-files/Makefile.am 2009-01-07 10:58:33 +0000
@@ -125,6 +125,3 @@
-e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
$< > $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'support-files/RHEL4-SElinux/Makefile.am'
--- a/support-files/RHEL4-SElinux/Makefile.am 2007-01-25 16:51:21 +0000
+++ b/support-files/RHEL4-SElinux/Makefile.am 2009-01-07 10:58:33 +0000
@@ -18,6 +18,3 @@
## Process this file with automake to create Makefile.in
EXTRA_DIST = mysql.fc mysql.te
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'tests/Makefile.am'
--- a/tests/Makefile.am 2007-07-24 07:03:01 +0000
+++ b/tests/Makefile.am 2009-01-07 10:58:33 +0000
@@ -37,7 +37,7 @@
bin_PROGRAMS = mysql_client_test
noinst_PROGRAMS = insert_test select_test thread_test bug25714
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
$(openssl_includes)
LIBS = @CLIENT_LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ \
@@ -59,7 +59,4 @@
DEFS = -DUNDEF_THREADS_HACK
thread_test.o: thread_test.c
- $(COMPILE) -c $(INCLUDES) $<
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
+ $(COMPILE) -c $(AM_CPPFLAGS) $<
=== modified file 'unittest/Makefile.am'
--- a/unittest/Makefile.am 2008-02-01 15:21:44 +0000
+++ b/unittest/Makefile.am 2009-01-07 10:58:33 +0000
@@ -25,6 +25,3 @@
test-verbose:
HARNESS_VERBOSE=1 perl unit.pl run $(unittests)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'unittest/examples/Makefile.am'
--- a/unittest/examples/Makefile.am 2007-10-10 07:14:58 +0000
+++ b/unittest/examples/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,8 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include \
- -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
AM_LDFLAGS = -L$(top_builddir)/unittest/mytap
@@ -23,6 +22,3 @@
noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t core-t
EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'unittest/mysys/Makefile.am'
--- a/unittest/mysys/Makefile.am 2008-12-13 11:02:16 +0000
+++ b/unittest/mysys/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+AM_CPPFLAGS = @ZLIB_INCLUDES@ \
-I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
noinst_HEADERS = thr_template.c
@@ -27,6 +27,3 @@
@ZLIB_LIBS@
EXTRA_DIST = CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'unittest/mytap/Makefile.am'
--- a/unittest/mytap/Makefile.am 2008-05-29 15:44:11 +0000
+++ b/unittest/mytap/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
+AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LIBRARIES = libmytap.a
noinst_HEADERS = tap.h
@@ -23,6 +23,3 @@
EXTRA_DIST = CMakeLists.txt
SUBDIRS = . t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'unittest/mytap/t/Makefile.am'
--- a/unittest/mytap/t/Makefile.am 2007-05-28 20:18:51 +0000
+++ b/unittest/mytap/t/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,13 +13,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(top_srcdir)/include
AM_LDFLAGS = -L$(top_builddir)/unittest/mytap
LDADD = -lmytap
noinst_PROGRAMS = basic-t
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'vio/Makefile.am'
--- a/vio/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/vio/Makefile.am 2009-01-07 10:58:33 +0000
@@ -13,8 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
- $(openssl_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(openssl_includes)
LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
pkglib_LIBRARIES = libvio.a
@@ -23,6 +22,3 @@
libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
EXTRA_DIST= CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'win/Makefile.am'
--- a/win/Makefile.am 2007-05-04 19:28:04 +0000
+++ b/win/Makefile.am 2009-01-07 10:58:33 +0000
@@ -16,6 +16,3 @@
## Process this file with automake to create Makefile.in
EXTRA_DIST = build-vs71.bat build-vs8.bat build-vs8_x64.bat configure.js README \
mysql_manifest.cmake create_manifest.js
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
=== modified file 'zlib/Makefile.am'
--- a/zlib/Makefile.am 2007-04-10 23:48:43 +0000
+++ b/zlib/Makefile.am 2009-01-07 10:58:33 +0000
@@ -15,7 +15,7 @@
# Process this file with automake to create Makefile.in
-INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
+AM_CPPFLAGS= -I$(top_srcdir)/include
LIBS= $(NON_THREADED_LIBS)
@@ -33,6 +33,3 @@
libzlt_la_SOURCES = $(libz_la_SOURCES)
EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
| Thread |
|---|
| • bzr commit into mysql-6.0 branch (jperkin:2807) | Jonathan Perkin | 12 Jan |
