* aclocal.m4: Add shared library support for Irix

	* configure.in: inactivate the old case statement that determined
	shared lib parameters; keep it around just for reference, though.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bfd98d76a96f6d9cff59a55c2837d41d6574f8e..e7175843f99fc9aa5dd79c7b9910ca8742dfb13b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 14 15:52:14 1997  Tom Yu  <tlyu@mit.edu>
+
+       * aclocal.m4: Add shared library support for Irix.
+
+       * configure.in: inactivate the old case statement that determined
+       shared lib parameters; keep it around just for reference, though.
+
 Wed Feb 12 16:17:44 1997  Tom Yu  <tlyu@mit.edu>
 
        * aclocal.m4: Remove INSTALL_VARIABLE_HACK, as it's no longer

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index ffd8247a4b5ef51c5f38a787208706de1bf6e688..f529886d8c5177c71649e83d7257eced4651a59d 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1149,6 +1149,18 @@ alpha-dec-osf*)
        # $(PROG_RPATH) is here to handle things like a shared tcl library
        RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`:$(PROG_RPATH):/usr/shlib:/usr/ccs/lib:/usr/lib/cmplrs/cc:/usr/lib:/usr/local/lib; export LD_LIBRARY_PATH; _RLD_ROOT=/dev/dummy/d; export _RLD_ROOT;'
        ;;
+mips-sgi-irix*)
+       SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
+       SHLIBEXT=.so
+       SHOBJEXT=.o
+       LDCOMBINE='ld -shared -ignore_unresolved -update_registry $(BUILDTOP)/so_locations'
+       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;'
+       ;;
 *-*-netbsd*)
        PICFLAGS=-fpic
        SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'

diff --git a/src/configure.in b/src/configure.in
index 6a245dfe9b3fe9f07ca33e09a3221dd146e28636..546b73e478702847d954ec060192d82181d6f023 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -13,7 +13,7 @@ yes;
 ])dnl
 AC_MSG_RESULT($krb5_cv_prog_gcc)
 dnl
-AC_MSG_CHECKING([for build host])
+ifelse([AC_MSG_CHECKING([for build host])
 AC_CACHE_VAL(krb5_cv_host, [export CC
 AC_CANONICAL_HOST
 krb5_cv_host=$host])
@@ -240,7 +240,7 @@ krb5_cv_shlibs_dirhead=
 krb5_cv_shlibs_tail_comp=
 krb5_cv_staticlibs_enabled=yes
 krb5_cv_shlibs_enabled=])
-
+])
 AC_KRB5_TCL
 AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],,)