From: Wilfredo Sanchez <tritan@mit.edu>
Date: Wed, 3 May 2000 06:51:25 +0000 (+0000)
Subject: Clean up Rhapsody/Darwin compilation options
X-Git-Tag: krb5-1.3-alpha1~2127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9337e76ff032df23f123725c09c1d155d93d300f;p=krb5.git

Clean up Rhapsody/Darwin compilation options

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

diff --git a/src/ChangeLog b/src/ChangeLog
index b811d59c0..677b44cf6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,17 @@
 	* config.guess, config.sub: Clean up Rhapsody and Mac OS X guesses.
 	Use powerpc-apple-darwin1.x on Mac OS X.
 
+	* aclocal.m4: Clean up to Rhapsody/Darwin compile options:
+	- Set the compatibility version of libraries to 0.1 for now so
+	binaries don't blow up every time a new library version rolls
+	out. We can add a compat variable to the lib makefiles if we think
+	this is needed.
+	- Don't forget LDFLAGS in CC_LINK_* and LDCOMBINE macros. This is
+	probably a good idea for all platforms. We'll need it in Darwin
+	for building multi-architecture binaries.
+	- The default for SHOBJEXT works, so there is no need to define it
+	again.
+
 2000-04-18  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in (clean-windows): Actually clean gss-sample on Windows.
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 24b62247b..e1010dc6a 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1274,10 +1274,9 @@ mips-*-netbsd*)
 	SHLIBSEXT='.$(LIBMAJOR).dylib'
 	SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
 	SHLIBEXT=.dylib
-	SHOBJEXT=.so
-	LDCOMBINE='cc -undefined warning -dynamiclib -dylib_compatibility_version=$(LIBMAJOR).$(LIBMINOR) -dylib_current_version=$(LIBMAJOR).$(LIBMINOR)'
-	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic'
-	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+	LDCOMBINE='$(CC) $(LDFLAGS) -undefined warning -dynamiclib -dylib_compatibility_version=0.1 -dylib_current_version=$(LIBMAJOR).$(LIBMINOR)'
+	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;'
 	;;