[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.2-93-g7f5d43e

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=7f5d43e158048fc660c676e58eff123b8d19d375

The branch, maint has been updated
       via  7f5d43e158048fc660c676e58eff123b8d19d375 (commit)
       via  6fd3e230c4251df977c43365129ead24e275dff5 (commit)
       via  7de7d19e6f8b88d7dc35be519430ac1f27e4ea59 (commit)
       via  c3e7ee629804d4d3b3338afd1cd54cab92903f79 (commit)
      from  706f26b7bde8b7e44210f6efe964333994f2e768 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7f5d43e158048fc660c676e58eff123b8d19d375
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 10 10:58:53 2012 +0200

    automake: remove an unused variable
    
    * automake.in ($canonical_location): This.
    (scan_autoconf_traces): Don't initialize it.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 6fd3e230c4251df977c43365129ead24e275dff5
Author: Stefano Lattarini <address@hidden>
Date:   Wed Aug 8 19:18:44 2012 +0200

    tests: make a test script more semantic
    
    This is mostly useful for Automake-NG, that is heavily overhauling the
    generated Makefiles and thus is prone to break grepping checks (which
    can sometimes end up causing false negatives in the testsuite, sadly).
    But this is not a reason not to strengthen the test for mainline
    Automake as well.
    
    * t/noinstdir.sh: Add semantic checks.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 7de7d19e6f8b88d7dc35be519430ac1f27e4ea59
Author: Stefano Lattarini <address@hidden>
Date:   Wed Aug 8 19:08:11 2012 +0200

    tests: remove an obsolete, no-op test script
    
    * t/info.sh: This: it tried to operate by checking the contents of the
    variable '$(INFOS)', but that is not even defined (and probably has been
    obsolete for quite a long time).  Since other tests already do thorough
    testing of the Texinfo support, just remove this test.
    * t/list-of-tests.mk: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit c3e7ee629804d4d3b3338afd1cd54cab92903f79
Author: Stefano Lattarini <address@hidden>
Date:   Wed Aug 8 19:02:13 2012 +0200

    tests: remove an obsolete test script
    
    * t/scripts.sh: This: it used to check that the 'AC_PROG_INSTALL' macro
    was not uselessly required, but today that macro is AC_REQUIRE'd by
    'AM_INIT_AUTOMAKE' anyway, so that the test is no more significant.
    * t/list-of-tests.mk: Adjust.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 automake.in        |    5 -----
 t/info.sh          |   44 --------------------------------------------
 t/list-of-tests.mk |    2 --
 t/noinstdir.sh     |   25 +++++++++++++++++++++++--
 t/scripts.sh       |   27 ---------------------------
 5 files changed, 23 insertions(+), 80 deletions(-)
 delete mode 100755 t/info.sh
 delete mode 100755 t/scripts.sh

diff --git a/automake.in b/automake.in
index e32b761..1a94c04 100644
--- a/automake.in
+++ b/automake.in
@@ -370,8 +370,6 @@ my $libtool_new_api = 0;
 
 # Most important AC_CANONICAL_* macro seen so far.
 my $seen_canonical = 0;
-# Location of that macro.
-my $canonical_location;
 
 # Where AM_MAINTAINER_MODE appears.
 my $seen_maint_mode;
@@ -5302,7 +5300,6 @@ sub scan_autoconf_traces ($)
          if ($seen_canonical <= AC_CANONICAL_BUILD)
            {
              $seen_canonical = AC_CANONICAL_BUILD;
-             $canonical_location = $where;
            }
        }
       elsif ($macro eq 'AC_CANONICAL_HOST')
@@ -5310,13 +5307,11 @@ sub scan_autoconf_traces ($)
          if ($seen_canonical <= AC_CANONICAL_HOST)
            {
              $seen_canonical = AC_CANONICAL_HOST;
-             $canonical_location = $where;
            }
        }
       elsif ($macro eq 'AC_CANONICAL_TARGET')
        {
          $seen_canonical = AC_CANONICAL_TARGET;
-         $canonical_location = $where;
        }
       elsif ($macro eq 'AC_CONFIG_AUX_DIR')
        {
diff --git a/t/info.sh b/t/info.sh
deleted file mode 100755
index e00e9e9..0000000
--- a/t/info.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test to make sure info files are distributed correctly.
-# FIXME: This test is probably obsoleted, or wrong.  The generated
-#        Makefile.in seems not to define any 'INFOS' variable!
-
-. ./defs || exit 1
-
-cat > Makefile.am << 'END'
-info_TEXINFOS = foo.texi
-END
-
-echo '@setfilename foo.info' > foo.texi
-: > texinfo.tex
-
-$ACLOCAL
-$AUTOMAKE
-
-for i in $(grep '^INFOS =' Makefile.in | sed -e 's/^INFOS = //'); do
-   echo $i
-   case "$i" in
-    foo*)
-       ;;
-    *)
-       exit 1
-       ;;
-   esac
-done
-
-:
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index d193adb..c54954e 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -501,7 +501,6 @@ t/help-silent.sh \
 t/help-upc.sh \
 t/hfs.sh \
 t/implicit.sh \
-t/info.sh \
 t/init.sh \
 t/init2.sh \
 t/insh2.sh \
@@ -963,7 +962,6 @@ t/self-check-seq.tap \
 t/self-check-is-blocked-signal.tap \
 t/self-check-unindent.tap \
 t/sanity.sh \
-t/scripts.sh \
 t/seenc.sh \
 t/silent.sh \
 t/silent2.sh \
diff --git a/t/noinstdir.sh b/t/noinstdir.sh
index be07970..24854cf 100755
--- a/t/noinstdir.sh
+++ b/t/noinstdir.sh
@@ -17,6 +17,7 @@
 # Test to make sure that noinst_* and check_* are not installed.
 # From Pavel Roskin.
 
+required=cc
 . ./defs || exit 1
 
 cat > Makefile.am << 'END'
@@ -36,6 +37,7 @@ cat >> configure.ac << 'END'
 AC_PROG_CC
 AM_PROG_AR
 AC_PROG_RANLIB
+AC_OUTPUT
 END
 
 : > ar-lib
@@ -43,7 +45,26 @@ END
 $ACLOCAL
 $AUTOMAKE
 
-grep 'noinstdir' Makefile.in && exit 1
-grep 'checkdir' Makefile.in && exit 1
+$EGREP '(noinst|check)dir' Makefile.in && exit 1
+
+$AUTOCONF
+./configure --prefix="$(pwd)/inst"
+
+echo 'int main (void) { return 0; }' > foo.c
+echo 'int main (void) { return 0; }' > bar.c
+
+echo 'int foo (void) { return 0; }' > libfoo.c
+echo 'int bar (void) { return 0; }' > libbar.c
+
+: > foo.sh
+: > foo.xpm
+: > foo.h
+: > bar.sh
+: > bar.xpm
+: > bar.h
+
+$MAKE
+$MAKE install
+test ! -e inst
 
 :
diff --git a/t/scripts.sh b/t/scripts.sh
deleted file mode 100755
index 996cc9a..0000000
--- a/t/scripts.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Test for bug reported by Jim Meyering.
-# AC_PROG_INSTALL was required when only noinst_SCRIPTS was defined.
-
-. ./defs || exit 1
-
-cat > Makefile.am << 'END'
-noinst_SCRIPTS = foo
-END
-
-$ACLOCAL
-$AUTOMAKE


hooks/post-receive
-- 
GNU Automake