From 2ef5ec316c2e7a34c6db6060f4869f0fd7026e03 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 17 Nov 2002 16:45:21 +0100 Subject: - Applied required modifications for automake 1.5 - "make distcheck" needs to be fixed BitKeeper/etc/ignore: Added autom4te.cache/output.0 autom4te.cache/requests autom4te.cache/traces.0 bdb/dist/autom4te.cache/output.0 bdb/dist/autom4te.cache/requests bdb/dist/autom4te.cache/traces.0 innobase/autom4te.cache/output.0 innobase/autom4te.cache/requests innobase/autom4te.cache/traces.0 to the ignore list acinclude.m4: - removed libtool.m4 (is part of libtool 1.4) config.guess: - applied diffs from config.guess of automake 1.5 config.sub: - applied diffs from config.sub of automake 1.5 configure.in: - renamed "AM_PROG_LIBTOOL" -> "AC_PROG_LIBTOOL" - added "AM_PROG_AS" for automake 1.5 dbug/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy extra/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy heap/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy install-sh: - applied diffs from install.sh of automake 1.5 isam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysql_r/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy ltconfig: - small correction for new libtool ltmain.sh: - applied diffs from ltmain.sh of libtool 1.4.2 merge/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy missing: - applied diffs from missing of automake 1.5 myisam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy myisammrg/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy mysys/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - added $(EXEEXT) to test_charset regex/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy sql/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy strings/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy - removed @CHARSET_SRCS@ vio/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy --- configure.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0fc85479db5..97b934b1420 100644 --- a/configure.in +++ b/configure.in @@ -161,7 +161,7 @@ fi AC_PROG_RANLIB # We use libtool #AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL #AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC @@ -446,6 +446,9 @@ AC_MSG_RESULT("$CHECK_PID") # We need a ANSI C compiler AM_PROG_CC_STDC +# We need an assembler, too +AM_PROG_AS + if test "$am_cv_prog_cc_stdc" = "no" then AC_MSG_ERROR([MySQL requires a ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) -- cgit v1.2.1 From 4cdf5497a9924266b2fa789e25370fd82b59389b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Nov 2002 16:30:19 +0100 Subject: added -DHAVE_BROKEN_REALPATH for FreeBSD builds --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 0fc85479db5..c66364f3b0c 100644 --- a/configure.in +++ b/configure.in @@ -922,7 +922,7 @@ case $SYSTEM_TYPE in ;; *freebsd*) echo "Adding fix for interrupted reads" - CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000" + CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" ;; *netbsd*) echo "Adding flag -Dunix" -- cgit v1.2.1 From 6600e656b18fdaa458297c50ed13cdf4c7f5c89e Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 18 Nov 2002 16:50:37 +0100 Subject: add -DHAVE_BROKEN_REALPATH to CFLAGS on FreeBSD (previous patch touched only CXXFLAGS) --- configure.in | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index e413bd20045..3fb495281a0 100644 --- a/configure.in +++ b/configure.in @@ -925,6 +925,7 @@ case $SYSTEM_TYPE in ;; *freebsd*) echo "Adding fix for interrupted reads" + CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH" CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH" ;; *netbsd*) -- cgit v1.2.1