From 05a945ecf42087ad46bd120624af0c356e4041c8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 May 2005 13:53:47 +0200 Subject: Makefile.am, configure.in: Enable creation of embedded lib when --with-darwin-mwcc configure.in: Enable creation of embedded lib when --with-darwin-mwcc libmysqld/Makefile.am: Enable creation of embedded lib when --with-darwin-mwcc --- configure.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 00ec737e76f..9d524de125a 100644 --- a/configure.in +++ b/configure.in @@ -145,8 +145,11 @@ AC_ARG_WITH(darwin-mwcc, export CC CXX LD AR RANLIB AC_SUBST(AR) AC_SUBST(RANLIB) + with_darwin_mwcc=yes ]) +AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes) + if test "x${CFLAGS-}" = x ; then cflags_is_set=no else -- cgit v1.2.1 From b0fc53f336f6380117bff7b1e647f3e7a9cc9800 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 May 2005 11:24:41 +0200 Subject: Build fixes configure.in: Fix for build problems - Removing extra semicolon and parentheses, this is not C++ :) --- configure.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index cd4f011e1ce..3e116d608f7 100644 --- a/configure.in +++ b/configure.in @@ -1374,20 +1374,20 @@ then AC_MSG_CHECKING("for gcc") if expr "$CC" : ".*gcc.*" then - CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" else - CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" fi else - { AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) }; + AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) fi else AC_MSG_RESULT("no") fi else - AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.]); + AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.]) fi else AC_MSG_RESULT("no") @@ -1419,15 +1419,15 @@ then AC_MSG_CHECKING("for gcc") if expr "$CC" : ".*gcc.*" then - CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" else - CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" fi AC_MSG_RESULT("yes") else - { AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) }; + AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) fi else AC_MSG_RESULT("no") @@ -1462,15 +1462,15 @@ then AC_MSG_CHECKING("for gcc") if expr "$CC" : ".*gcc.*" then - CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" else - CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; - CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"; + CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" + CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK" fi AC_MSG_RESULT("yes") else - { AC_MSG_ERROR([configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual.]) }; + AC_MSG_ERROR([configure: error: Can't find thread libs on Caldera OpenUNIX 8. See the Installation chapter in the Reference Manual.]) fi else AC_MSG_RESULT("no") -- cgit v1.2.1