diff options
| author | kent@mysql.com <> | 2005-05-10 13:56:08 +0200 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-05-10 13:56:08 +0200 |
| commit | 7c65e20e324da230f1eb93b7b522c55347fe00e1 (patch) | |
| tree | 29749e948c906b4b2fff5568cbf1853e8dfbea74 | |
| parent | 70506c67ffbc6bb4a12a08996220853bf97a67fd (diff) | |
| parent | faf8f825b546e33b0ec78f88afe7b02b3606bb98 (diff) | |
| download | mariadb-git-7c65e20e324da230f1eb93b7b522c55347fe00e1.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 1f36a45d40c..a5872a79ae3 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 diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 4cf2c3f67a7..f578e87ae4a 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -83,6 +83,9 @@ INC_LIB= $(top_builddir)/regex/libregex.a \ # generate a total libmysqld.a from all library files, libmysqld.a: libmysqld_int.a $(INC_LIB) +if DARWIN_MWCC + mwld -lib -o $@ libmysqld_int.a `ls -1 $(INC_LIB) | sort -u` +else if test "$(host_os)" = "netware" ; \ then \ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ @@ -104,7 +107,7 @@ libmysqld.a: libmysqld_int.a $(INC_LIB) rm -f tmp/* ; \ $(RANLIB) libmysqld.a ; \ fi - +endif ## XXX: any time the client interface changes, we'll need to bump ## the version info for libmysqld; however, it's possible for the |