diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-02 08:41:38 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-02 08:41:38 +0000 |
commit | b4a4f854abd3d25fe9d3a3c71e613792e34cdb00 (patch) | |
tree | 89e5b4b0ffe770c7dc573405d88c8e956349cc7a /berkeleydb | |
parent | bbf8a0accb1956f6d44c74ba09c0526381d50edd (diff) |
INTEGRATION: CWS macosxmerge (1.10.8); FILE MERGED
2003/05/17 15:45:53 fa 1.10.8.1: Allow berkeleydb to compile on Mac OS X.
a) Make makefile.mk understand .dylib SO suffix through $(DLLPOST)
b) Mac OS X libtool/configure updates from OOO_STABLE_1_PORTS
c) change to -undefined error so we can link two-level namespace
d) due to (c) we have to include STLport libs on link line
http://www.openoffice.org/project/www/issues/show_bug.cgi?id=13694
Contributors:
Richard Stacpoole
Dan Williams
Dan Williams
fa@ooo
Diffstat (limited to 'berkeleydb')
-rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index 999866545515..a4dc2f553181 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: vg $ $Date: 2003-04-01 13:35:55 $ +# last change: $Author: vg $ $Date: 2003-06-02 09:41:38 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -89,7 +89,7 @@ CONFIGURE_FLAGS=--enable-cxx --enable-java --enable-dynamic --enable-shared BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=make -OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*.so +OUT2LIB=$(BUILD_DIR)$/.libs$/libdb*$(DLLPOST) OUT2BIN=java$/classes$/db.jar |