small changes to accomodate other versions of configure

4 files changed, 84 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index bd8d348..55a7762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 Fri Dec 27 16:26:47 1991  K. Richard Pixley  (rich at cygnus.com)
 
-	* configure.in, Makefile.in: fix clean-info, add flex.
+	* configure.in, Makefile.in: fix clean-info, add flex.  add
+	  fileutils.
 
-	* configure: be less sensitive to spaces in Makefile.in.
+	* configure: be less sensitive to spaces in Makefile.in.  Do not
+	  look for sources in "..".  Doing so breaks subdirectories that
+	  might have their own configure.  If a subdir has it's own
+	  configure script, use it.
 
 Thu Dec 26 16:30:26 1991  K. Richard Pixley  (rich at cygnus.com)
 
diff --git a/Makefile.in b/Makefile.in
index 17b5736..bb44d29 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -98,7 +98,7 @@ install-dir.info:
 
 # clib prms
 all.normal: all-texinfo all-bison all-byacc all-flex all-ld all-gnulib \
-	all-gdb all-make all-cvs all-emacs all-ispell
+	all-gdb all-make all-cvs all-emacs all-ispell all-fileutils
 all.cross: all-bison all-ld all-gnulib all-gdb
 #	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS) $(OTHERS)"
 
@@ -106,7 +106,7 @@ clean: clean-libiberty clean-texinfo clean-bfd clean-binutils \
 	clean-bison clean-byacc clean-flex clean-ld clean-gas \
 	clean-gcc clean-gnulib clean-readline clean-glob clean-gdb \
 	clean-make clean-diff clean-grep clean-rcs clean-gdbm \
-	clean-cvs clean-emacs clean-ispell
+	clean-cvs clean-emacs clean-ispell clean-fileutils
 	rm -rf *.a TEMP errs core *.o *~ \#* TAGS *.E
 
 install: $(INSTALL_TARGET)
@@ -116,7 +116,7 @@ install.all: install-dirs install-libiberty install-texinfo \
 	install-binutils install-bison install-byacc install-flex \
 	install-ld install-gas install-gcc install-gnulib \
 	install-readline install-glob install-gdb install-make \
-	install-cvs install-emacs install-ispell
+	install-cvs install-emacs install-ispell install-fileutils
 install.cross: install-dirs install-libiberty install-binutils install-bison \
 	install-byacc install-ld install-gas install-gnulib \
 	install-readline install-glob install-gdb
@@ -1414,6 +1414,72 @@ install-flex: force
 		true ; \
 	fi
 
+### fileutils
+.PHONY: all-fileutils just-fileutils
+all-fileutils: just-fileutils
+just-fileutils: force
+	if [ -d $(unsubdir)/fileutils ] ; then \
+		(cd $(unsubdir)/fileutils$(subdir); \
+		$(MAKE) \
+			"prefix=$(prefix)" \
+			"datadir=$(datadir)" \
+			"mandir=$(mandir)" \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			all) ; \
+	else \
+		true ; \
+	fi
+
+clean-fileutils: force
+	if [ -d $(unsubdir)/fileutils ] ; then \
+		(cd $(unsubdir)/fileutils$(subdir); \
+		$(MAKE) \
+			"prefix=$(prefix)" \
+			"datadir=$(datadir)" \
+			"mandir=$(mandir)" \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			clean) ; \
+	else \
+		true ; \
+	fi
+
+install-fileutils: force
+	if [ -d $(unsubdir)/fileutils ] ; then \
+		(cd $(unsubdir)/fileutils$(subdir); \
+		$(MAKE) \
+			"prefix=$(prefix)" \
+			"datadir=$(datadir)" \
+			"mandir=$(mandir)" \
+			"against=$(against)" \
+			"AR=$(AR)" \
+			"AR_FLAGS=$(AR_FLAGS)" \
+			"CC=$(CC)" \
+			"RANLIB=$(RANLIB)" \
+			"LOADLIBES=$(LOADLIBES)" \
+			"LDFLAGS=$(LDFLAGS)" \
+			"BISON=$(BISON)" \
+			"MAKEINFO=$(MAKEINFO)" \
+			install) ; \
+	else \
+		true ; \
+	fi
+
 ### other supporting targets
 # this is a bad hack.
 all.xclib:	all.normal
diff --git a/configure b/configure
index 882497d..b06cf25 100755
--- a/configure
+++ b/configure
@@ -360,8 +360,6 @@ fi
 if [ -z "${srcdir}" ] ; then
 	if [ -r configure.in ] ; then
 		srcdir=.
-	elif [ -r ../configure.in ] ; then
-		srcdir=..
 	else
 		echo '***' "Can't find configure.in.  Try using -srcdir=some_dir"
 		exit 1
@@ -755,7 +753,13 @@ ${progname}" ${arguments}  "
 					esac
 
 ### The recursion line is here.
-					if (${progname} -recurring ${host_alias} -target=${target_alias} \
+					if [ -x configure ] ; then
+						recprog=`pwd`/configure
+					else
+						recprog=${progname}
+					fi
+
+					if (${recprog} -recurring ${host_alias} -target=${target_alias} \
 						${verbose} ${subdirs} ${removing} ${prefixoption} \
 						${tmpdiroption} ${namesubdiroption} ${datadiroption} \
 						${srcdiroption}) ; then
diff --git a/configure.in b/configure.in
index f72c957..81c97e8 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,8 @@
 # script appropriate for this directory.  For more information, check
 # any existing configure script.
 
-configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob flex ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms"
-srctrigger=README
+configdirs="libiberty texinfo bfd binutils byacc bison gcc readline glob flex ld gas gnulib clib gdb emacs ispell make grep diff rcs gdbm cvs prms fileutils"
+srctrigger=cfg-paper.texi
 srcname="gnu development package"
 
 # per-host: