From 36b18019927a7882d017300c77f8702019cdf6d6 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 1 May 1996 03:30:20 +0000
Subject: * Makefile.in (tgz-bin, pkgdir): New targets. (PKGDIR, GZIPPROG): New
 variables.

* aclocal.m4 (WITH_NETLIB): Don't look for socket lib on Irix.

* aclocal.m4 (MAKE_SUBDIRS): Disable hack that tries to determine if "-k" or
"-i" was given.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7882 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/aclocal.m4 | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/aclocal.m4')

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 38433549c..c70348eed 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -82,9 +82,11 @@ define(MAKE_SUBDIRS,[dnl
 AC_PUSH_MAKEFILE()dnl
 changequote(<<<,>>>)dnl
 
-$2::<<<
-	@case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
-		*[ik]*) e=:;; *) e="exit 1";; esac; \
+$2::
+dnl These don't work well with some versions of GNU make.
+dnl	@case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
+dnl		*[ik]*) e=:;; *) e="exit 1";; esac; \
+<<<	@e="exit 1";\
 	for i in $(SUBDIRS) ; do \
 		if test -d $$i ; then \
 			echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
@@ -790,7 +792,9 @@ AC_ARG_WITH([netlib],
 	AC_MSG_RESULT("netlib will use \'$withval\'")
   fi
 ,dnl
-[AC_CHECK_LIB(socket,main)
+[if test "`(uname) 2>/dev/null`" != IRIX ; then
+  AC_CHECK_LIB(socket,main)
+fi
 AC_CHECK_LIB(nsl,main)]
 )])dnl
 dnl
-- 
cgit