More fixes

diff --git a/ChangeLog b/ChangeLog
index b994daa..291afd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 Mon Aug  5 00:12:45 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
+       * automake.in (scan_configure): AM_INIT_AUTOMAKE sets
+       seen_prog_install to `2'.
+
+       * configure.in: Don't run AM_PROG_INSTALL.
+
        * automake.in (parse_arguments): Use $PACKAGE.
        ($PACKAGE): New global.
        ($am_c_prototypes): Renamed.

diff --git a/TODO b/TODO
index 37d3de9..3241aba 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
 Priorities for release:
   [ none ]
 
-!! auto-generate aclocal.m4 under certain circumstances
+** when can aclocal.m4 be auto-generated?
 
 ** Consider using implicit .y.c and .l.c rules instead of current
    lex/yacc trickery
@@ -47,10 +47,6 @@ to fully support libtool ("grody compilation issue")
 If @LIBOBJS@ or @ALLOCA@ appears in _LDADD or _LIBADD, put it into
 dependencies automatically
 
-* ansi2knr.c needs STDC_HEADERS and HAVE_STRING_H
-  [ I've asked François about this.  The change should probably
-    be in the fp_C_PROTOTYPES macro ]
-
 Think about: maybe "make check" should just bomb if error occurs?
 Then user must use "make -k check".  This is probably more natural.
 

diff --git a/automake.in b/automake.in
index b11b565..a7a7216 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2313,6 +2313,7 @@ sub scan_configure
            $seen_package = 1;
            $seen_version = 1;
            $seen_arg_prog = 1;
+           $seen_prog_install = 2;
        }
 
        # Some things required by Automake.

diff --git a/configure b/configure
index c5a5d74..f7f9208 100755 (executable)
--- a/configure
+++ b/configure
@@ -691,9 +691,6 @@ test "$program_suffix" != NONE &&
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 755'
-
-
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 66b1cea..a0a7cd5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,6 @@ AM_INIT_AUTOMAKE(automake, 1.1b)
 
 AC_PROG_MAKE_SET
 AC_ARG_PROGRAM
-AM_PROG_INSTALL
 
 AC_PATH_PROG(PERL, perl)
 if test -z "$PERL"; then