From a3281f5bf5e8be16804fddafc0e58d0f80028587 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 23 May 1996 16:05:41 +0000 Subject: [PATCH] Bug fix --- ChangeLog | 5 +++++ THANKS | 1 + automake.in | 8 ++++++-- tests/ChangeLog | 6 ++++++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/fpinst2.test | 21 +++++++++++++++++++++ tests/fpinstall.test | 21 +++++++++++++++++++++ 8 files changed, 62 insertions(+), 4 deletions(-) create mode 100755 tests/fpinst2.test create mode 100755 tests/fpinstall.test diff --git a/ChangeLog b/ChangeLog index 083746fef..350014e38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 23 10:01:13 1996 Tom Tromey + + * automake.in (scan_configure): Always allow upgrading to + fp_PROG_INSTALL. Test fpinstall.test. + Wed May 22 09:49:27 1996 Tom Tromey * automake.in (initialize_per_input): Don't initialize diff --git a/THANKS b/THANKS index deb58eeca..7660379a5 100644 --- a/THANKS +++ b/THANKS @@ -16,4 +16,5 @@ Karl Berry Mark Galassi Markku Rossi Noah Friedman +Thomas Morgan Ulrich Drepper diff --git a/automake.in b/automake.in index be5df8e67..66ac2b1fa 100755 --- 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 c323e1f19..7b49b1988 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +Thu May 23 09:58:48 1996 Tom Tromey + + * fpinst2.test: New file. + + * fpinstall.test: New file. + Wed May 22 09:45:52 1996 Tom Tromey * outdir.test: New file. diff --git a/tests/Makefile.am b/tests/Makefile.am index e519b7f81..9dcf13cb7 100644 --- 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 91143d6bf..3a7ecc26e 100644 --- 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 index 000000000..48887f840 --- /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 index 000000000..d76953a6d --- /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 -- 2.11.4.GIT