diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2005-10-05 01:29:58 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2005-10-05 01:29:58 +0000 |
| commit | 05103f7a0c61dbf937ec7e2264cb6cd966814ed6 (patch) | |
| tree | 3d2805947c5dbc91e18f3fe71dfa668046aec696 /src/aclocal.m4 | |
| parent | 745cddfcd791359ff5ae5c2f33db3b196f6df481 (diff) | |
| download | krb5-05103f7a0c61dbf937ec7e2264cb6cd966814ed6.zip krb5-05103f7a0c61dbf937ec7e2264cb6cd966814ed6.tar.gz krb5-05103f7a0c61dbf937ec7e2264cb6cd966814ed6.tar.bz2 | |
Move libdb2 makefile stuff down into db2 module subtree.
Some steps towards making module build on Darwin, not there yet.
* aclocal.m4 (KRB5_BUILD_LIBRARY_WITH_DEPS): Substitute DYNOBJEXT and
MAKE_DYNOBJ_COMMAND.
(KRB5_LIB_AUX): Don't define _KDB5_STATIC_LINK.
* config/libnover.in (darwin.exports): New target.
($(LIBBASE)$(DYNOBJEXT)): New target, instead of $(LIBBASE)$(SHLIBVEXT).
(all-libs): Build $(LIBBASE)$(DYNOBJEXT).
(install-shared): Use DYNOBJEXT.
* config/pre.in (DYNOBJEXT, MAKE_DYNOBJ_COMMAND): New variables.
* config/shlib.conf: Set DYNOBJEXT, MAKE_DYNOBJ_COMMAND to the SHLIB versions.
For Darwin, set them to create a .so bundle, and set SHLIB_EXPORT_FILE_DEP to
darwin.exports.
* config/pre.in (DB_DEPLIB, DB_DEPLIB-k5, DB_DEPLIB-sys, DB_VERSION, DB_DEPS,
DB_DEPS-sys, DB_DEPS-k5, DB_DEPS-redirect, DB_LIB, KDB5_DB_LIB): Variables
deleted.
(KDB5_LIBS): Set to just $(KDB5_LIB).
* modules/kdb/db2/Makefile.in (DB_VERSION, DB_DEPS, DB_DEPS-sys, DB_DEPS-k5,
DB_DEPS-redirect, DB_LIB, KDB5_DB_LIB, DB_DEPLIB, DB_DEPLIB-k5, DB_DEPLIB-sys):
Variable definitions moved here from config/pre.in.
(SHLIB_EXPLIBS): Only use gssrpc and KDB5_DB_LIB.
* modules/kdb/db2/libdb2/test/Makefile.in (DB_LIB, DB_DEPLIB): Define here now.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17408 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 77d876a..dfcbdca 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1209,7 +1209,10 @@ AC_SUBST(SHLIBVEXT) AC_SUBST(SHLIBSEXT) AC_SUBST(DEPLIBEXT) AC_SUBST(PFLIBEXT) -AC_SUBST(LIBINSTLIST)]) +AC_SUBST(LIBINSTLIST) +AC_SUBST(DYNOBJEXT) +AC_SUBST(MAKE_DYNOBJ_COMMAND) +]) dnl dnl KRB5_BUILD_LIBOBJS @@ -1272,7 +1275,7 @@ else OBJLISTS=OBJS.ST LIBINSTLIST=install-static DEPLIBEXT=$STLIBEXT - CFLAGS="$CFLAGS -D_KDB5_STATIC_LINK" +# CFLAGS="$CFLAGS -D_KDB5_STATIC_LINK" fi # Check whether to build shared libraries. |