fixed up "missing" support

12 files changed, 43 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 42b38ce9f..ba03190e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 Tue Mar 18 17:20:03 1997  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (initialize_global_constants): [common_files]
+	Include `missing'.
+	(scan_configure): Require `missing'.
+
+	* header-vars.am (MAKEINFO): Don't define.
+
+	* m4/init.m4 (missing_dir): Use AM_MISSING_PROG.
+	* m4/missing.m4: New file.
+
 	`missing' changes from François Pinard:
 	* Everywhere: Use ACLOCAL_M4 to name aclocal.m4 file; ACLOCAL now
 	names aclocal program.
diff --git a/NEWS b/NEWS
index e8ef99aa5..90de2b86e 100644
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ New in 1.1m:
 * No longer have to explicitly touch stamp-h when using AC_CONFIG_HEADER;
   AM_CONFIG_HEADER handles it automatically
 * Texinfo output files no longer need .info extension
+* Added `missing' support
 
 New in 1.0:
 * Bug fixes
diff --git a/automake.in b/automake.in
index f226842ad..d19824b15 100755
--- a/automake.in
+++ b/automake.in
@@ -3798,7 +3798,7 @@ sub scan_configure
     # looking at a subdir Makefile.  We must set relative_dir so that
     # the file-finding machinery works.
     local ($relative_dir) = '.';
-    &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs');
+    &require_config_file ($FOREIGN, 'install-sh', 'mkinstalldirs', 'missing');
     &am_error ("\`install.sh' is an anachronism; use \`install-sh' instead")
         if -f $config_aux_path[0] . '/install.sh';
 }
@@ -4346,7 +4346,8 @@ sub initialize_global_constants
 	 "config.guess", "config.sub", "AUTHORS", "BACKLOG", "ABOUT-GNU",
 	 "libversion.in", "mdate-sh", "mkinstalldirs", "install-sh",
 	 'texinfo.tex', "ansi2knr.c", "ansi2knr.1", 'elisp-comp',
-	 'interlock', 'ylwrap', 'acinclude.m4', @libtoolize_files
+	 'interlock', 'ylwrap', 'acinclude.m4', @libtoolize_files,
+	 'missing'
 	 );
 
     # Commonly used files we auto-include, but only sometimes.
diff --git a/header-vars.am b/header-vars.am
index a7be51c78..243648136 100644
--- a/header-vars.am
+++ b/header-vars.am
@@ -48,7 +48,6 @@ ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
-MAKEINFO = @MAKEINFO@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index a7be51c78..243648136 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -48,7 +48,6 @@ ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
-MAKEINFO = @MAKEINFO@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff --git a/m4/Makefile.am b/m4/Makefile.am
index b7ccb6661..8cccf1be0 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -4,9 +4,8 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 \
-lispdir.m4 maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
-winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4
-
+m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \
+maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
+winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4
 
 EXTRA_DIST = $(m4data_DATA)
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 6c385b00d..001e26dd6 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -47,9 +47,9 @@ AUTOMAKE_OPTIONS = gnits
 MAINT_CHARSET = latin1
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 \
-lispdir.m4 maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
-winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4
+m4data_DATA = ccstdc.m4 dmalloc.m4 init.m4 install.m4 lispdir.m4 \
+maintainer.m4 protos.m4 ptrdiff.m4 regex.m4 strtod.m4 termios.m4 \
+winsz.m4 mktime.m4 error.m4 obstack.m4 sanity.m4 header.m4 missing.m4
 
 EXTRA_DIST = $(m4data_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/m4/init.m4 b/m4/init.m4
index 0842fdfed..578b300fb 100644
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -17,9 +17,11 @@ AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_SANITY_CHECK
 AC_ARG_PROGRAM
-AC_CHECK_PROG(ACLOCAL, aclocal, aclocal, \$(SHELL) missing aclocal)
-AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, \$(SHELL) missing autoconf)
-AC_CHECK_PROG(AUTOMAKE, automake, automake, \$(SHELL) missing automake)
-AC_CHECK_PROG(AUTOHEADER, autoheader, autoheader, \$(SHELL) missing autoheader)
-AM_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, \$(SHELL) ../missing makeinfo)
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_PROG_MAKE_SET])
diff --git a/m4/missing.m4 b/m4/missing.m4
new file mode 100644
index 000000000..9e822762e
--- /dev/null
+++ b/m4/missing.m4
@@ -0,0 +1,11 @@
+## --------------------------------------------------------- ##
+## Fake the existence of programs that GNU maintainers use.  ##
+## --------------------------------------------------------- ##
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[if $2 --version > /dev/null 2>&1; then
+    $1=$2
+ else
+    $1="$3/missing $2"
+ fi])
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 7c610a8e2..a89b94141 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 18 22:36:34 1997  Tom Tromey  <tromey@cygnus.com>
+
+	* remake2.test: Changed for `missing' support.
+
 Sun Mar 16 14:29:45 1997  Tom Tromey  <tromey@cygnus.com>
 
 	* seenc.test: New file.
diff --git a/tests/defs b/tests/defs
index 13a450852..8062c5e6c 100644
--- a/tests/defs
+++ b/tests/defs
@@ -34,6 +34,7 @@ END
 
 : > install-sh
 : > mkinstalldirs
+: > missing
 
 # See how redirections should work.  User can set VERBOSE to see all
 # output.
diff --git a/tests/remake2.test b/tests/remake2.test
index 74545f062..b8b804400 100755
--- a/tests/remake2.test
+++ b/tests/remake2.test
@@ -17,4 +17,4 @@ mkdir sub
 
 $AUTOMAKE || exit 1
 
-grep 'automake.*sub/Makefile' sub/Makefile.in
+grep 'AUTOMAKE.*sub/Makefile' sub/Makefile.in