From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 24 Mar 2004 01:33:16 +0000 (+0000)
Subject: * shlib.conf (default_static, default_shared): New variables to set
X-Git-Tag: krb5-1.4-beta1~515
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aca1136e97dc5027a1756852870eae2814e0c176;p=krb5.git

* shlib.conf (default_static, default_shared): New variables to set

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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 3fdb58eb3..87c5a5ef5 100644
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-23  Ken Raeburn  <raeburn@mit.edu>
+
+	* shlib.conf (default_static, default_shared): New variables to
+	set.
+
 2004-03-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* ac-archive: New directory.
diff --git a/src/config/shlib.conf b/src/config/shlib.conf
index 27aa9ed0c..e3d853662 100644
--- a/src/config/shlib.conf
+++ b/src/config/shlib.conf
@@ -17,6 +17,10 @@ PFOBJEXT=.po
 # Default for systems w/o shared libraries
 CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
 
+# Default to static or shared libraries?
+default_static=no
+default_shared=yes
+
 # Set up architecture-specific variables.
 case $krb5_cv_host in
 alpha*-dec-osf*)
@@ -235,6 +239,8 @@ mips-*-netbsd*)
 	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
 	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
 	RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;'
+	default_static=yes
+	default_shared=no
 	;;
 
 *-*-solaris*)