[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-224-g454cbc4

[Ralf Wildenhues]

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=454cbc4c4440beb4a7368248ff7859edc54c0aae

The branch, master has been updated
       via  454cbc4c4440beb4a7368248ff7859edc54c0aae (commit)
      from  9a2df59841c8906e230a6ebe4e9cafb90dc03d56 (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 454cbc4c4440beb4a7368248ff7859edc54c0aae
Author: Charles Wilson <address@hidden>
Date:   Tue Nov 11 23:34:47 2008 +0100

    Cleanup config.lt in case LT_OUTPUT is in use.
    
    * lib/am/libtool.am [TOPDIR_P] (distclean-libtool): clean up
    config.lt as well as libtool.
    * tests/libtoo11.test: New test.
    * tests/Makefile.am: Update.
    * NEWS: Update.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                          |   10 ++++++++++
 NEWS                               |    3 +++
 lib/am/libtool.am                  |    6 +++---
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/{tar2.test => libtoo11.test} |   22 ++++++++++------------
 6 files changed, 28 insertions(+), 15 deletions(-)
 copy tests/{tar2.test => libtoo11.test} (72%)

diff --git a/ChangeLog b/ChangeLog
index dd3caa5..8dd1158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-11 Charles Wilson  <address@hidden>  (tiny change)
+          Ralf Wildenhues  <address@hidden>
+
+       Cleanup config.lt in case LT_OUTPUT is in use.
+       * lib/am/libtool.am [TOPDIR_P] (distclean-libtool): clean up
+       config.lt as well as libtool.
+       * tests/libtoo11.test: New test.
+       * tests/Makefile.am: Update.
+       * NEWS: Update.
+
 2008-11-11  Ralf Wildenhues  <address@hidden>
 
        * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub,
diff --git a/NEWS b/NEWS
index 2bcb448..7ccc3e1 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ New in 1.10a:
   - Libtool generic flags are now passed to the install and uninstall
     modes as well.
 
+  - distcheck works with Libtool 2.x even when LT_OUTPUT is used, as
+    config.lt is removed correctly now.
+
 * Languages changes:
 
   - subdir-object mode works now with Fortran (F77, FC, preprocessed
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 103f4d0..d565b69 100644
--- a/lib/am/libtool.am
+++ b/lib/am/libtool.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2005
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2005,
+## 2008  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
@@ -26,4 +26,4 @@ clean-libtool:
 
 ?TOPDIR_P?distclean-am: distclean-libtool
 ?TOPDIR_P?distclean-libtool:
-?TOPDIR_P?     -rm -f libtool
+?TOPDIR_P?     -rm -f libtool config.lt
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 52c37c5..023e1f7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -357,6 +357,7 @@ libtool7.test \
 libtool8.test \
 libtool9.test \
 libtoo10.test \
+libtoo11.test \
 license.test \
 link_c_cxx.test        \
 link_dist.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 04d205c..4207f6c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -510,6 +510,7 @@ libtool7.test \
 libtool8.test \
 libtool9.test \
 libtoo10.test \
+libtoo11.test \
 license.test \
 link_c_cxx.test        \
 link_dist.test \
diff --git a/tests/tar2.test b/tests/libtoo11.test
similarity index 72%
copy from tests/tar2.test
copy to tests/libtoo11.test
index 3f03c98..030e2d3 100755
--- a/tests/tar2.test
+++ b/tests/libtoo11.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2008  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
@@ -14,27 +14,25 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Check the tar-pax option.
+# Make sure config.lt is removed with Libtool 2.2.x's LT_OUTPUT.
+# Report by Charles Wilson.
 
+required=libtoolize
 . ./defs || Exit 1
-
 set -e
 
-cat > configure.in << 'END'
-AC_INIT([tar2], [1.0])
-AM_INIT_AUTOMAKE([tar-pax])
-AC_CONFIG_FILES([Makefile])
+cat >> configure.in << 'END'
+AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 AC_OUTPUT
 END
 
 : > Makefile.am
 
+libtoolize
 $ACLOCAL
+$AUTOMAKE --add-missing
 $AUTOCONF
-$AUTOMAKE
 ./configure
-
-grep 'am__tar.*false' Makefile && Exit 77
-
 $MAKE distcheck
-test -f tar2-1.0.tar.gz
+:


hooks/post-receive
--
GNU Automake