summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorkent@mysql.com <>2005-05-10 13:53:47 +0200
committerkent@mysql.com <>2005-05-10 13:53:47 +0200
commitfaf8f825b546e33b0ec78f88afe7b02b3606bb98 (patch)
tree05f43a71cf967942681ec5b680dfb24d3ef906bf /libmysqld
parent08bba8bc22b91082229a4eab67b31674e44c8159 (diff)
downloadmariadb-git-faf8f825b546e33b0ec78f88afe7b02b3606bb98.tar.gz
Makefile.am, configure.in:
Enable creation of embedded lib when --with-darwin-mwcc
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am5
1 files changed, 4 insertions, 1 deletions
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