Changes to support AIX shared libraries. The interactions

between configure.in and Makefile.in change significantly for shared
libraries: the static library target is no longer specified in the
Makefile, although a rule to make the static library is specified.
Also, none of the libraries have any more unresolved symbols.  As
discussed, libcom_err.a is made shared and symlinks are created in
lib.

	These changes sort of work, although I suspect cleanup is
necessary.  I don't think it breaks too much on other platforms.

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

6 files changed, 40 insertions, 21 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index 580498117..5e183bd99 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 22 18:34:26 1995  Sam Hartman  (hartmans@tardis)
+
+	* configure.in: Changed to new scheme for static libs.
+
+
 
 Fri Jun 16 11:14:50 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Add install target for shared library.
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 615626d56..1fcb041d4 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -41,7 +41,7 @@ all-mac:: $(OBJS)
 
 all-windows:: $(OBJS)
 
-libcrypto.a: $(LIBDONE)
+libcrypto.$(STEXT): $(LIBDONE)
 	if test -f $@ ; then \
 		for i in $(LIB_SUBDIRS) ; \
 		do \
@@ -59,10 +59,6 @@ libcrypto.a: $(LIBDONE)
 libcrypto.lib:
 	libdir crypto.lib
 
-install:: libcrypto.a
-	$(INSTALL_DATA) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
-	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
-
 clean:: clean-$(WHAT)
 
 clean-unix::
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index f75bfd29e..ef8c07953 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -8,8 +8,6 @@ AC_PROG_INSTALL
 V5_SHARED_LIB_OBJS
 SubdirLibraryRule([${OBJS}])
 DO_SUBDIRS
-LinkFileDir(../libcrypto.a, libcrypto.a, ./crypto)
-AppendRule([all-unix:: ../libcrypto.a])
 V5_MAKE_SHARED_LIB(libcrypto)
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
@@ -19,6 +17,13 @@ AppendRule([install::	libcrypto.[$](SHEXT)
 	[$](INSTALL_DATA) libcrypto.[$](SHEXT)	\
 		[$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libcrypto.[$](SHEXT)])
 ])dnl
-AppendRule([all-unix:: libcrypto.a])
-AppendRule([all:: all-$(WHAT)])
+if test -n "$krb5_cv_enable_staticlibs" ; then
+        AppendRule([all-unix:: libcrypto.a])
+        LinkFileDir(../libcrypto.a, libcrypto.a, ./crypto)
+        AppendRule([all-unix:: ../libcrypto.a])
+        AppendRule([install:: libcrypto.a
+	$(INSTALL_DATA) libcrypto.a $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a
+	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libcrypto.a])
+fi
+        AppendRule([all:: all-$(WHAT)])
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 69f75fad2..fea2a0b49 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 22 18:03:35 1995  Sam Hartman  (hartmans@tardis)
+
+	* Makefile.in: Treat libcom_err.a as shared, use new conventions
+	regarding static version.
+
 
 Fri Jun 16 11:16:44 EDT 1995	Paul Park	(pjpark@mit.edu)
 	* configure.in - Add shared library install target.
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 7ce3eb256..ee4ba56c0 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -19,21 +19,21 @@ LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 KRB4_LIBS=@KRB4_LIB@
 KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@
 DEPKRB4_LIBS=@DEPKRB4_LIB@ @DEPKRB4_CRYPTO_LIB@
-DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT)
-SHLIB_LIBS=$(KRB4_LIBS) $(KRB4_CRYPTO_LIBS) -lcrypto
-SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	\
-	$(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message
+DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT) $(TOPLIBD)/libcom_err.$(SHEXT)
+SHLIB_LIBS=$(KRB4_LIBS) $(KRB4_CRYPTO_LIBS) -lcrypto -lcom_err
+SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@	
+#	$(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 
 all-unix::
 
 all-windows::
 
-libkrb5.a: $(LIBDONE)
+libkrb5.$(STEXT): $(LIBDONE)
 	if test -f $@ ; then \
 		for i in $(LIB_SUBDIRS) ; \
 		do \
-			$(LIBUPDATE) $@ $$i/DONE $$i ; \
+			$(LIBUPDATE)nn $@ $$i/DONE $$i ; \
 		done ; \
 	else \
 		for i in $(LIB_SUBDIRS) ; \
@@ -41,13 +41,15 @@ libkrb5.a: $(LIBDONE)
 			$(LIBUPDATE) --force $@ $$i/DONE $$i ; \
 		done ; \
 	fi
-	$(RANLIB) libkrb5.a
+	$(RANLIB) libkrb5.$(STEXT)
 	touch libkrb5.stamp
 
-install:: 
+install-mac:: 
 	$(INSTALL_DATA) libkrb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
 	$(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libkrb5.a
 
+
+
 clean:: clean-$(WHAT)
 
 clean-unix::
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 4c60aba56..86e3545da 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -6,17 +6,23 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
-AppendRule([all:: libkrb5.a])
+AppendRule([all:: libkrb5.[$](STEXT)])
 V5_MAKE_SHARED_LIB(libkrb5)
 AC_ARG_ENABLE([shared],
 [  --enable-shared         build shared libraries],[
 LinkFileDir(../libkrb5.[$](SHEXT), libkrb5.[$](SHEXT), ./krb5)
 AppendRule([all-unix:: ../libkrb5.$(SHEXT)])
-AppendRule([install::	libkrb5.[$](SHEXT)
+AppendRule([install-unix::	libkrb5.[$](SHEXT)
 	[$](INSTALL_DATA) libkrb5.[$](SHEXT)	\
 		[$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libkrb5.[$](SHEXT)])
 ])dnl
-LinkFileDir(../libkrb5.a, libkrb5.a, ./krb5)
-AppendRule([all-unix:: ../libkrb5.a])
+if test -n "$krb5_cv_enable_staticlibs" ; then
+	LinkFileDir(../libkrb5.[$](STEXT), libkrb5.[$](STEXT), ./krb5)
+        AppendRule([install:: 
+	[$](INSTALL_DATA) libkrb5.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb5.[$](STEXT)
+	[$](RANLIB) [$](DESTDIR)[$](KRB5_LIBDIR)/libkrb5.[$](STEXT)]) 
+	AppendRule([all-unix:: ../libkrb5.[$](STEXT)])
+fi
+AppendRule([install:: install-[$](WHAT)])
 AppendRule([all::	all-$(WHAT)])
 V5_AC_OUTPUT_MAKEFILE