From 2c5026a393b7070e68cbfbb4c1dfe02da45b604f Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Wed, 14 Jun 1995 23:42:26 +0000
Subject: [PATCH] 	* aclocal.m4(_MAKE_SUBDIRS): revert yet again; no
 workaround since 		subshells inherit "-e" flag.  Ultrix sucks.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6064 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ChangeLog  | 9 +++++++++
 src/aclocal.m4 | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 13de4cc20..38f14f0d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jun 14 16:51:28 1995  Tom Yu  (tlyu@dragons-lair)
+
+	* aclocal.m4(_MAKE_SUBDIRS): revert yet again; no workaround since
+		subshells inherit "-e" flag.  Ultrix sucks.
+
+	* aclocal.m4 (_MAKE_SUBDIRS): "-@" was the wrong answer; set a
+		shell variable "e" to "exit 0" and execute it after the
+		make in each subdirectory
+
 Tue Jun 13 01:44:12 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* aclocal.m4 (CopySrcHeader): do a set -x before mkdir
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 4593e59a2..9a9a04aec 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -96,8 +96,8 @@ AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl
 changequote(<<<,>>>)dnl
 
 $2::<<<
-	-@case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
-		*[ik]*) ;; *) set -e ;; esac; \
+	@case "`echo '$(MAKEFLAGS)'|sed -e 's/ --.*$$//'`" in \
+		*[ik]*) set +e;; *) set -e;; esac; \
 	for i in $(SUBDIRS) ; do \
 		(cd $$i ; echo>>> $1 <<<"in $(CURRENT_DIR)$$i..."; \
 			$(MAKE) CC="$(CC)" CCOPTS="$(CCOPTS)" \
-- 
2.26.2