summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>1997-02-14 20:54:09 +0000
committerTom Yu <tlyu@mit.edu>1997-02-14 20:54:09 +0000
commitd2a9147da28671f50c3cfc5e90f80a51e3e853db (patch)
tree9b4a643bfe5d9fcd2f3a980cdfe4e91bf89d2d28 /src
parent10ff64ba31d3feb487e9d8f898be083090516427 (diff)
downloadkrb5-d2a9147da28671f50c3cfc5e90f80a51e3e853db.tar.gz
krb5-d2a9147da28671f50c3cfc5e90f80a51e3e853db.tar.xz
krb5-d2a9147da28671f50c3cfc5e90f80a51e3e853db.zip
* 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
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/aclocal.m412
-rw-r--r--src/configure.in4
3 files changed, 21 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9bfd98d76..e7175843f 100644
--- 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 ffd8247a4..f529886d8 100644
--- 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 6a245dfe9..546b73e47 100644
--- 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],,)