Fixes to build shared libs on AIX

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10836 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index af2d8a923870fb3d3a8828b3bbf71aaf8317a651..00b0d418feb018e1776f4b9c810755433f13ceb7 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -888,6 +888,10 @@ AC_ARG_ENABLE([shared],
        *)
                if test "$krb5_force_static" = "yes"; then
                        AC_MSG_RESULT([Forcing static libraries.])
+               SHLIBEXT=.so-nobuild
+       SHLIBVEXT=.so.v-nobuild
+               CC_LINK="$CC_LINK_STATIC"
+       SHLIBSEXT=.so.s-nobuild
                else
                        AC_MSG_RESULT([Enabling shared libraries.])
                        LIBLIST="$LIBLIST "'lib$(LIB)$(SHLIBEXT)'
@@ -903,13 +907,13 @@ AC_ARG_ENABLE([shared],
                                ;;
                        esac
                        OBJLISTS="$OBJLISTS OBJS.SH"
-               fi
                DEPLIBEXT=$SHLIBEXT
                CC_LINK="$CC_LINK_SHARED"
                if test "$STLIBEXT" = "$SHLIBEXT" ; then
                  STLIBEXT=".a-no-build"
                  LIBINSTLIST="install-shared" #don't install static
                fi
+fi
                ;;
        esac
 else
@@ -1018,7 +1022,7 @@ mips-sgi-irix6.3) # This is a Kludge; see below
        SHLIBEXT=.so
        SHOBJEXT=.o
        # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld)
-       if test "$GCC" = yes; then
+       if test "$KRB5_CV_PROG_GCC" = yes; then
                LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
        else
                LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
@@ -1047,7 +1051,7 @@ mips-sgi-irix*)
 
 # untested...
 mips-sni-sysv4)
-       if test "$GCC" = yes; then
+       if test "$KRB5_CV_PROG_GCC" = yes; then
                PICFLAGS=-fpic
                LDCOMBINE='$(CC) -G -Wl,-h -Wl,lib$(LIB)$(SHLIBSEXT)'
        else
@@ -1114,7 +1118,7 @@ mips-*-netbsd*)
        ;;
 
 *-*-solaris*)
-       if test "$GCC" = yes; then
+       if test "$KRB5_CV_PROG_GCC" = yes; then
                PICFLAGS=-fpic
                LDCOMBINE='$(CC) -shared -h lib$(LIB)$(SHLIBSEXT)'
        else
@@ -1171,7 +1175,7 @@ mips-*-netbsd*)
        LDCOMBINE='$(BUILDTOP)/util/makeshlib $(LIBMAJOR).$(LIBMINOR)'
        SHLIB_EXPFLAGS='  $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
        PROFFLAGS=-pg
-       if test "$gcc" = "yes" ; then
+       if test "$krb5_cv_prog_gcc" = "yes" ; then
          CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Xlinker -bex4:$(BUILDTOP)/util/aix.bincmds '
        else
          CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -bex4:$(BUILDTOP)/util/aix.bincmds '

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 883794a2b61c6ff93fd5f60dd7afd92667003be7..45d031571dfe2de8b8894b12466dec89edad0e48 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 16 16:52:10 1998  Sam Hartman  <hartmans@utwig.mesas.com>
+
+       * Makefile.in (SHLIB_EXPLIBS): Include $(LIBS) so building on AIX works
+
 Sun Jul 26 18:12:22 1998  Sam Hartman  <hartmans@utwig.mesas.com>
 
        * Makefile.in (LIBMAJOR): bump libmajor

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index c774b3407dc9d180b4d9eb48b81ec0eedeb2296e..c44b58631d61e21d3db2ab2f737e5692a16a7ff1 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -14,7 +14,7 @@ RELDIR=kdb
 SHLIB_EXPDEPS = \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT)
-SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto
+SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index c8bc9ce8187c57d4c036f668eafdf31093771f81..c878926798d7e6f5b2aea386d6bf9491a0cc5a47 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-12    <root@tertius>
+
+       * Makefile.in: Add dependency on -lcom_err
+
 Mon Mar  2 16:19:58 1998  Ezra Peisach  <epeisach@mit.edu>
 
        * Makefile.in: Integrate in the krb5 build tree rules.

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index 6dd0377c80a5cf84f447067a9ffa286068df0a1f..7f566d8c209ae8bf134c5d497ffb797dd7430968 100644 (file)
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -36,6 +36,11 @@ MLIBS = -lcom_err $(GEN_LIB)
 LIB=profile
 LIBMAJOR=1
 LIBMINOR=0
+SHLIB_EXPDEPS = $(TOPLIBD)/libcom_err$(SHLIBEXT)
+SHLIB_EXPLIBS = -lcom_err
+SHLIB_DIRS = -L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
+
 STOBJLISTS=OBJS.ST
 
 all-unix:: includes test_parse test_profile

diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
index 7441f615c6e0ef3b8ac467fdada4061014ab9df1..0594dbaa917b9d7d987c2d0667ae91f6f0be39bd 100644 (file)
--- a/src/util/profile/configure.in
+++ b/src/util/profile/configure.in
@@ -9,5 +9,6 @@ AC_HAVE_FUNCS(stat)
 AC_PROG_AWK
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBRARY
+KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE
+

diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog
index 46919b61f8e623781fceab6442a08d29a5b7c3a3..d5c5ba6bc3b8773c4922b06a4c1d5122e99b53db 100644 (file)
--- a/src/util/pty/ChangeLog
+++ b/src/util/pty/ChangeLog
@@ -1,3 +1,7 @@
+1998-08-16    <hartmans@fundsxpress.com>
+
+       * Makefile.in (SHLIB_EXPDEPS): Depend on lib_comerr
+
 1998-07-05    <hartmans@fundsxpress.com>
 
        * update_utmp.c (pty_update_utmp): If the ut_exit differs test

diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in
index 339a11e9308bf628a34cba5021a27cc512d6fa35..1bf272b587ec39fe0ebfcf49cc49260bfcddc059 100644 (file)
--- a/src/util/pty/Makefile.in
+++ b/src/util/pty/Makefile.in
@@ -31,6 +31,11 @@ CFILES=$(srcdir)/cleanup.c $(srcdir)/getpty.c $(srcdir)/init_slave.c \
 
 
 SRCS=pty_err.c $(CFILES)
+SHLIB_EXPDEPS = \
+       $(TOPLIBD)/libcom_err$(SHLIBEXT)
+SHLIB_EXPLIBS= -lcom_err 
+SHLIB_DIRS=-L$(TOPLIBD)
+SHLIB_RDIRS=$(KRB5_LIBDIR)
 
 DEPLIBS=
 

diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in
index 71adc940d5fe61d8557e7976638fcae04af3ea93..4c58d6ee3681262f6fee12d61f0fa773ae0fae6c 100644 (file)
--- a/src/util/pty/configure.in
+++ b/src/util/pty/configure.in
@@ -150,6 +150,6 @@ fi
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
-KRB5_BUILD_LIBRARY
+KRB5_BUILD_LIBRARY_WITH_DEPS
 KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE