[Automake-commit] [SCM] GNU Automake branch, branch-1-10, updated. Release-1-10-1-50-g8e0618f

[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=8e0618fc7340ac4ddbfbc6189d7ed71a127b3a1e

The branch, branch-1-10 has been updated
       via  8e0618fc7340ac4ddbfbc6189d7ed71a127b3a1e (commit)
      from  ff7965dcd1a21bb3155f387e9c4efe0ee21703ea (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 8e0618fc7340ac4ddbfbc6189d7ed71a127b3a1e
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                               |    5 +++++
 lib/am/libtool.am                  |    6 +++---
 tests/Makefile.am                  |    1 +
 tests/Makefile.in                  |    1 +
 tests/{man3.test => libtoo11.test} |   30 ++++++++++++------------------
 6 files changed, 32 insertions(+), 21 deletions(-)
 copy tests/{man3.test => libtoo11.test} (67%)

diff --git a/ChangeLog b/ChangeLog
index 8fb8022..8dcb43e 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 3e74d10..ea96842 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,11 @@ Bugs fixed in 1.10.1a:
 
 * Bugs introduced by 1.10.1:
 
+* Changes to Libtool support:
+
+  - distcheck works with Libtool 2.x even when LT_OUTPUT is used, as
+    config.lt is removed correctly now.
+
 * Miscellaneous changes:
 
   - The manual is now distributed under the terms of the GNU FDL 1.3.
diff --git a/lib/am/libtool.am b/lib/am/libtool.am
index 1c6e0a7..f6333ac 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
@@ -28,4 +28,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 8892c1e..e2a9ab0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -334,6 +334,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 f47d272..0938b6c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -467,6 +467,7 @@ libtool7.test \
 libtool8.test \
 libtool9.test \
 libtoo10.test \
+libtoo11.test \
 license.test \
 link_c_cxx.test        \
 link_dist.test \
diff --git a/tests/man3.test b/tests/libtoo11.test
similarity index 67%
copy from tests/man3.test
copy to tests/libtoo11.test
index fe9394d..030e2d3 100755
--- a/tests/man3.test
+++ b/tests/libtoo11.test
@@ -14,31 +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/>.
 
-# PR 516: Prefer generated manpages to distributed ones.
-
-. ./defs || exit 1
+# 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 > Makefile.am << 'END'
-dist_man_MANS = foo.1
-installcheck-local:
-       grep bar "$(mandir)/man1/foo.1"
-END
-
-cat >>configure.in <<'END'
-: ${foo=foo}
-AC_SUBST([foo])
-AC_CONFIG_FILES([foo.1])
+cat >> configure.in << 'END'
+AC_PROG_LIBTOOL
+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 AC_OUTPUT
 END
 
-cat > foo.1.in <<'END'
address@hidden@
-END
+: > Makefile.am
 
+libtoolize
 $ACLOCAL
-$AUTOMAKE
+$AUTOMAKE --add-missing
 $AUTOCONF
 ./configure
-DISTCHECK_CONFIGURE_FLAGS=foo=bar $MAKE -e distcheck
+$MAKE distcheck
+:


hooks/post-receive
--
GNU Automake