From 556b80503ce144ccc33371c5ce8b4b19491fb4a8 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Fri, 18 Aug 2000 04:16:25 +0000
Subject: [PATCH] * configure.in: Simplified dependency tracking by using
 "-include" with GNU Make * autogen.sh: Exit on all failures

---
 ChangeLog    |  6 ++++++
 autogen.sh   | 23 +++++++++++++++--------
 configure.in |  4 +---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 960071369..edc04ed84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-18  Pavel Roskin  <proski@gnu.org>
+
+	* configure.in: Simplified dependency tracking by using
+	"-include" with GNU Make
+	* autogen.sh: Exit on all failures
+
 2000-08-17  Pavel Roskin  <proski@gnu.org>
 
 	* doc/mc.sgml: Curly braces replaced with &lcub; and &rcub;
diff --git a/autogen.sh b/autogen.sh
index 3eb8a5ce4..93ef9576d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,15 +6,22 @@ test -z "$srcdir" && srcdir=.
 
 (
 cd $srcdir
-if test -d macros; then
-	test -f mc-aclocal.m4 && test -f gettext.m4 && cat mc-aclocal.m4 gettext.m4 > acinclude.m4
-	aclocal -I macros $ACLOCAL_FLAGS
+if test -d macros && test -f mc-aclocal.m4 && test -f gettext.m4; then
+	cat mc-aclocal.m4 gettext.m4 > acinclude.m4
+	aclocal -I macros $ACLOCAL_FLAGS || exit 1
 else
-	echo macros directory not found, skipping generation of aclocal.m4
+	if test -f aclocal.m4; then
+		echo Warning: aclocal.m4 cannot be rebuilt
+	else
+		echo Error: aclocal.m4 cannot be created
+		exit 1
+	fi
 fi
-autoheader
-autoconf
-(cd vfs/samba; autoheader; autoconf)
-)
+autoheader || exit 1
+autoconf  || exit 1
+cd vfs/samba || exit 1
+autoheader || exit 1
+autoconf || exit 1
+) || exit 1
 
 $srcdir/configure --enable-maintainer-mode $*
diff --git a/configure.in b/configure.in
index 4c580df95..271942430 100644
--- a/configure.in
+++ b/configure.in
@@ -1222,9 +1222,7 @@ if test x$ac_cv_prog_gnu_make = xyes; then
     MCFGR='include ./Make.common'
     MCF=/dev/null
     PHONY='.PHONY:'
-    DOTDEPEND='ifeq (.depend,$(wildcard .depend)) \
-include .depend \
-endif'
+    DOTDEPEND='-include .depend'
     WRITEDEP=":"
     ac_cv_make_with_percent_rules=yes
 else