Bug fix

diff --git a/ChangeLog b/ChangeLog
index 083746fefed3382d201aed1d3ad02e10a4f4bcde..350014e389574559d26cc37f0bdc27661c8570f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May 23 10:01:13 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * automake.in (scan_configure): Always allow upgrading to
+       fp_PROG_INSTALL.  Test fpinstall.test.
+
 Wed May 22 09:49:27 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * automake.in (initialize_per_input): Don't initialize

diff --git a/THANKS b/THANKS
index deb58eeca3db60a7329edd243c87951bfa01f1db..7660379a53f56177738e7b0fb05b98df2e6e6562 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -16,4 +16,5 @@ Karl Berry <kb@cs.umb.edu>
 Mark Galassi <rosalia@nis.lanl.gov>
 Markku Rossi <mtr@ngs.fi>
 Noah Friedman <friedman@gnu.ai.mit.edu>
+Thomas Morgan <tmorgan@pobox.com>
 Ulrich Drepper <drepper@gnu.ai.mit.edu>

diff --git a/automake.in b/automake.in
index be5df8e67b03db4fc5c9507f309f2da7d6463e2b..66ac2b1fadc236cda1c025fa0570f5bb2ce1c8cc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2066,14 +2066,18 @@ sub scan_configure
 
        # Some things required by Automake.
        $seen_make_set = 1 if /AC_PROG_MAKE_SET/;
-       $seen_prog_install = 1 if ! $seen_prog_install && /AC_PROG_INSTALL/;
-       $seen_prog_install = 2 if ! $seen_prog_install && /fp_PROG_INSTALL/;
        $seen_arg_prog = 1 if /AC_ARG_PROGRAM/;
        $seen_ranlib = 1 if /AC_PROG_RANLIB/;
         $seen_maint_mode = 1 if /jm_MAINTAINER_MODE/;
         $seen_package = 1 if /PACKAGE=/;
         $seen_version = 1 if /VERSION=/;        
 
+        # Weird conditionals here because it is always allowed to
+        # upgrade to fp_PROG_INSTALL but never to downgrade to
+        # AC_PROG_INSTALL.
+       $seen_prog_install = 1 if ! $seen_prog_install && /AC_PROG_INSTALL/;
+       $seen_prog_install = 2 if /fp_PROG_INSTALL/;
+
         if (/AC_PROG_LIBTOOL/ || /gm_PROG_LIBTOOL/)
        {
            $seen_libtool = 1;

diff --git a/tests/ChangeLog b/tests/ChangeLog
index c323e1f19e459d45e65f5d018538d1529c8361bb..7b49b1988e42201bd7af8f82838a03997916603a 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+Thu May 23 09:58:48 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * fpinst2.test: New file.
+
+       * fpinstall.test: New file.
+
 Wed May 22 09:45:52 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * outdir.test: New file.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e519b7f81deca604afb0fe3d61915ed0b7f576a5..9dcf13cb75d8e75eebd6c3d9626a19d4c798e241 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -8,6 +8,6 @@ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
-insh2.test outdir.test
+insh2.test outdir.test fpinstall.test fpinst2.test
 
 EXTRA_DIST = defs $(TESTS)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 91143d6bf8190eb3f3e3d51c5e769806e63eb866..3a7ecc26e0e69f20638edc33dd3844a64c220c8a 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -46,7 +46,7 @@ confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
 target.test extra.test noinst.test instman.test mkinstall.test auxdir.test \
 canon3.test mdate2.test subdir.test backsl.test package.test number.test \
-insh2.test outdir.test
+insh2.test outdir.test fpinstall.test fpinst2.test
 
 EXTRA_DIST = defs $(TESTS)
 mkinstalldirs = $(top_srcdir)/mkinstalldirs

diff --git a/tests/fpinst2.test b/tests/fpinst2.test
new file mode 100755 (executable)
index 0000000..48887f8
--- /dev/null
+++ b/tests/fpinst2.test
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# Test to make sure "reversed" order of fp_PROG_INSTALL and
+# AC_PROG_INSTALL is not buggy.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+fp_PROG_INSTALL
+AC_PROG_INSTALL
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am <<'END'
+bin_SCRIPTS = zot
+END
+
+$AUTOMAKE || exit 1

diff --git a/tests/fpinstall.test b/tests/fpinstall.test
new file mode 100755 (executable)
index 0000000..d76953a
--- /dev/null
+++ b/tests/fpinstall.test
@@ -0,0 +1,21 @@
+#! /bin/sh
+
+# Test for bug reported by Thomas Morgan.  If both fp_PROG_INSTALL and
+# AC_PROG_INSTALL appear in configure.in, bad error results.
+
+. $srcdir/defs || exit 1
+
+cat > configure.in << 'END'
+PACKAGE=nonesuch
+VERSION=nonesuch
+AC_ARG_PROGRAM
+AC_PROG_INSTALL
+fp_PROG_INSTALL
+AC_OUTPUT(Makefile)
+END
+
+cat > Makefile.am <<'END'
+bin_SCRIPTS = zot
+END
+
+$AUTOMAKE || exit 1