Finish up Darwin linker flags

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12231 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 4352eddae2f1610ef90b0f32b13e02e60c63205b..d920206e7f81942a2bdd18bbb953d20fe384155d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,10 @@
        * config/pre.in: Set KRB5_INCDIR from @includedir@ so configure
        --includedir=foo works.
 
+       * aclocal.m4 (Darwin): Settle on LIBMAJOR as compat
+       version. Change "-dylib_foo=X" options to "-foo X", which actually
+       work. Specify -install_name path.
+
 2000-05-04  Wilfredo Sanchez <tritan@mit.edu>
 
        * Makefile.in: kadmin server binaries install into SERVER_BINDIR

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index e1010dc6a6384b69bd57de0cdf22a1eef56b7680..79c31b21c0a2520b66af633ecba560023d921d3c 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1274,7 +1274,7 @@ mips-*-netbsd*)
        SHLIBSEXT='.$(LIBMAJOR).dylib'
        SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        SHLIBEXT=.dylib
-       LDCOMBINE='$(CC) $(LDFLAGS) -undefined warning -dynamiclib -dylib_compatibility_version=0.1 -dylib_current_version=$(LIBMAJOR).$(LIBMINOR)'
+       LDCOMBINE='$(CC) $(LDFLAGS) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)"'
        CC_LINK_SHARED='$(CC) $(LDFLAGS) $(PROG_LIBPATH) -dynamic'
        CC_LINK_STATIC='$(CC) $(LDFLAGS) $(PROG_LIBPATH)'
        RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;'