[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. v1.12.2-819-g1a6ebd1

[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=1a6ebd193bc78a3c6641b62df2ff5369ec09c584

The branch, ng/master has been updated
       via  1a6ebd193bc78a3c6641b62df2ff5369ec09c584 (commit)
       via  03b7cf99c697f1b9d601de50b8fcd4698d254d21 (commit)
       via  21ec3a527390dc996ae09172b625a576f82ebcba (commit)
       via  3c85b9c95b745b08aea12afe1f0839d30228cbaa (commit)
       via  7f5d43e158048fc660c676e58eff123b8d19d375 (commit)
       via  6fd3e230c4251df977c43365129ead24e275dff5 (commit)
       via  7de7d19e6f8b88d7dc35be519430ac1f27e4ea59 (commit)
       via  c3e7ee629804d4d3b3338afd1cd54cab92903f79 (commit)
      from  c84bdee5dc0828e4d6cf2eca371fae1db24fd516 (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 1a6ebd193bc78a3c6641b62df2ff5369ec09c584
Merge: c84bdee 03b7cf9
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 10 13:27:14 2012 +0200

    Merge branch 'master' into ng/master
    
    * master:
      cleanup: remove two almost-unused global variables: {am,in}_file_name
      cleanup: remove almost-unused global var 'topsrcdir'
      automake: remove an unused variable
      tests: make a test script more semantic
      tests: remove an obsolete, no-op test script
      tests: remove an obsolete test script
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

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

diff --git a/automake.in b/automake.in
index cd39d65..153c246 100644
--- a/automake.in
+++ b/automake.in
@@ -367,8 +367,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;
 
 # Actual version we've seen.
 my $package_version = '';
@@ -4261,7 +4259,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')
@@ -4269,13 +4266,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/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