diff options
| author | Sam Hartman <hartmans@mit.edu> | 1997-02-22 07:57:57 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1997-02-22 07:57:57 +0000 |
| commit | 0d6d6daaa5fe6ac8a9e758a5544f603aadc66300 (patch) | |
| tree | 9d8d98685e2826408ea66bce0cb139c4ff95c2b2 /src | |
| parent | b65c326c64f678ebc8a3665272a271c07d0b783c (diff) | |
| download | krb5-0d6d6daaa5fe6ac8a9e758a5544f603aadc66300.tar.gz krb5-0d6d6daaa5fe6ac8a9e758a5544f603aadc66300.tar.xz krb5-0d6d6daaa5fe6ac8a9e758a5544f603aadc66300.zip | |
* Make shared libs work on AIX
* Support platforms where SHEXT = STEXT
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9947 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/aclocal.m4 | 27 |
2 files changed, 32 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bec8b439b..0200a8140 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,15 @@ +Fri Feb 21 15:58:55 1997 Sam Hartman <hartmans@mit.edu> + + * aclocal.m4 (CC_LINK_STATIC): Define appropriate flags to build + shared libs on AIX. + + Fri Feb 21 12:00:53 1997 Theodore Y. Ts'o <tytso@mit.edu> * aclocal.m4 (CC_LINK_SHARED): Linux doesn't understand -R; use "-bWl,-rpath -Wl,$(PROG_RPATH)" instead. + Sun Feb 16 21:17:11 1997 Richard Basch <basch@lehman.com> * Makefile.in: Build krb4 library under win16/win32 diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 8fbd40159..f8f1152e7 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1049,8 +1049,8 @@ if test "$enableval" = no && test "$krb5_force_static" != yes; then LIBLIST= OBJLISTS= else - LIBLIST='lib$(LIB)$(STLIBEXT)' - LIBLINKS='$(TOPLIBD)/lib$(LIB)$(STLIBEXT)' + LIBLIST="lib\$(LIB)$STLIBEXT" + LIBLINKS="\$(TOPLIBD)/lib\$(LIB)$STLIBEXT" OBJLISTS=OBJS.ST LIBINSTLIST=install-static DEPLIBEXT=$STLIBEXT @@ -1074,6 +1074,10 @@ AC_ARG_ENABLE([shared], LIBINSTLIST="$LIBINSTLIST install-shared" DEPLIBEXT=$SHLIBEXT CC_LINK="$CC_LINK_SHARED" + if test "$STLIBEXT" = "$SHLIBEXT" ; then + STLIBEXT=".a-no-build" + LIBINSTLIST="install-shared" #don't install static + fi ;; esac else @@ -1217,4 +1221,23 @@ mips-sgi-irix*) CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)' CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' ;; +*-*-aix*) + SHLIBVEXT='.a.$(LIBMAJOR).$(LIBMINOR)' + SHLIBEXT=.a + # AIX doesn't need separate PIC objects + SHOBJEXT=.o + LDCOMBINE='$(BUILDTOP)/util/makeshlib $(LIBMAJOR).$(LIBMINOR)' + SHLIB_EXPFLAGS=' $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' + PROFFLAGS=-pg + if test "$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 ' + fi + CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)' + # $(PROG_RPATH) is here to handle things like a shared tcl library + RUN_ENV='LIBPATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/lib:/usr/local/lib; export LIBPATH; ' + esac]) + + |