Wed Jul 8 01:10:44 1998 Matthew D Hancher <mdh@mit.edu>

        * aclocal.m4: Allow shared libraries to build properly under Irix
        6.x with gcc. (This is actually a fix of a previous fix that
        didn't make it into ChangeLog.)

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 651c09780739b44465e6c9c26c042bf991bf4160..10197664573e31e60d1c00ca2bf9c1e7f712e2da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul  8 01:10:44 1998  Matthew D Hancher  <mdh@mit.edu>
+
+       * aclocal.m4: Allow shared libraries to build properly under Irix
+       6.x with gcc. (This is actually a fix of a previous fix that
+       didn't make it into ChangeLog.)
+
 Thu Jul  2 20:41:02 1998  Theodore Y. Ts'o  <tytso@mit.edu>
 
        * Makefile.in: Update commands to build the Macintosh MPW Makefile

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index df432ee611f480bef7b4bb85d6da2fb77acd2b34..e37a7827ad56620ec5152f700b63bd3abbb6b579 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1009,12 +1009,26 @@ alpha-dec-osf*)
        RUN_ENV='SHLIB_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export SHLIB_PATH;'
        ;;
 
-mips-sgi-irix*)
+mips-sgi-irix5*)
        SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
        SHLIBSEXT='.so.$(LIBMAJOR)'
        SHLIBEXT=.so
        SHOBJEXT=.o
-       # Kludge follows:
+       LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
+       SHLIB_EXPFLAGS='-rpath $(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
+       # no gprof for Irix...
+       PROFFLAGS=-p
+       CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -Wl,-rpath -Wl,$(PROG_RPATH)'
+       CC_LINK_STATIC='$(CC) $(PROG_LIBPATH)'
+       RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
+       ;;
+
+mips-sgi-irix6*)
+       SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+       SHLIBSEXT='.so.$(LIBMAJOR)'
+       SHLIBEXT=.so
+       SHOBJEXT=.o
+       # Kludge follows: (gcc makes n32 object files but ld expects o32, so we reeducate ld)
        if test "$GCC" = yes; then
                LDCOMBINE='ld -n32 -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations -soname lib$(LIB)$(SHLIBSEXT)'
        else