[SCM] GNU Libtool branch, master, updated. v2.2.10-21-g4d3ac40

[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 Libtool".

The branch, master has been updated
       via  4d3ac408c863b1110ce7782d44c80b24f24111f1 (commit)
       via  47e4d7da64e121ebf26b66d1bab16d8ca4608c5d (commit)
      from  8cc72b48f67a6869584f0c73b0bbad1415ef9eff (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 4d3ac408c863b1110ce7782d44c80b24f24111f1
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jun 16 06:03:27 2010 +0200

    Optimize func_ltwrapper_scriptname to assume a cwrapper.
    
    * libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
    call func_ltwrapper_executable_p again here, this function is
    documented to allow being called with wrapper executables.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 47e4d7da64e121ebf26b66d1bab16d8ca4608c5d
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jun 15 19:23:16 2010 +0200

    Fix bootstrap script to cope with changed AC_INIT arguments.
    
    * bootstrap: When extracting PACKAGE and VERSION from AC_INIT
    arguments, be sure to remove a 'GNU ' prefix and lowercase the
    package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
    appropriately for GNU software.  Pass these variables to the
    make commands creating tests/package.m4 and other files.
    * Makefile.am (edit): Fix substitution of PACKAGE_NAME and
    PACKAGE_STRING.
    * libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
    @address@hidden
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                        |   18 ++++++++++++++++++
 Makefile.am                      |    4 ++--
 bootstrap                        |   20 ++++++++++++++++----
 libltdl/config/announce-gen.m4sh |    2 +-
 libltdl/config/ltmain.m4sh       |    9 +++------
 5 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 958cca9..a5676ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2010-06-16  Ralf Wildenhues  <address@hidden>
+
+       Optimize func_ltwrapper_scriptname to assume a cwrapper.
+       * libltdl/config/ltmain.m4sh (func_ltwrapper_scriptname): Do not
+       call func_ltwrapper_executable_p again here, this function is
+       documented to allow being called with wrapper executables.
+
+       Fix bootstrap script to cope with changed AC_INIT arguments.
+       * bootstrap: When extracting PACKAGE and VERSION from AC_INIT
+       arguments, be sure to remove a 'GNU ' prefix and lowercase the
+       package name for PACKAGE.  Also set PACKAGE_NAME and PACKAGE_URL
+       appropriately for GNU software.  Pass these variables to the
+       make commands creating tests/package.m4 and other files.
+       * Makefile.am (edit): Fix substitution of PACKAGE_NAME and
+       PACKAGE_STRING.
+       * libltdl/config/announce-gen.m4sh: Use @PACKAGE@ not
+       @address@hidden
+
 2010-06-15  Peter Rosin  <address@hidden>
 
        On Windows, find potential libs regardless of file name case.
diff --git a/Makefile.am b/Makefile.am
index 1114e67..d0688ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,8 @@ edit = sed \
        -e 's,@PACKAGE\@,$(PACKAGE),g' \
        -e 's,@PACKAGE_BUGREPORT\@,$(PACKAGE_BUGREPORT),g' \
        -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
-       -e 's,@PACKAGE_NAME\@,$(PACKAGE),g' \
-       -e 's,@PACKAGE_STRING\@,$(PACKAGE) $(VERSION),g' \
+       -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
+       -e 's,@PACKAGE_STRING\@,$(PACKAGE_NAME) $(VERSION),g' \
        -e 's,@PACKAGE_TARNAME\@,$(PACKAGE),g' \
        -e 's,@PACKAGE_VERSION\@,$(VERSION),g' \
        -e 's,@SED\@,$(SED),g' \
diff --git a/bootstrap b/bootstrap
index d505c36..81ed4b0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
 #! /bin/sh
 # bootstrap -- Helps bootstrapping libtool, when checked out from repository.
 #
-#   Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software Foundation, Inc,
+#   Copyright (C) 2003, 2004, 2005, 2006, 2009, 2010 Free Software
+#   Foundation, Inc,
 #   Mritten by Gary V. Vaughan, 2003
 #
 #   This file is part of GNU Libtool.
@@ -116,9 +117,18 @@ fi
 set dummy `$SED -n '
     /AC_INIT/{
        s/[][,()]/ /g
+       s/ GNU / /
        p
     }' configure.ac`
 shift
+PACKAGE=`echo "$2" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+PACKAGE_NAME=$2
+PACKAGE_URL=
+if grep 'AC_INIT.*GNU' configure.ac >/dev/null; then
+  PACKAGE_NAME="GNU $PACKAGE_NAME"
+  PACKAGE_URL="http://www.gnu.org/software/$PACKAGE/";
+fi
+VERSION=$3
 
 # Whip up a dirty Makefile:
 makes='Makefile.am libltdl/Makefile.inc'
@@ -135,13 +145,15 @@ rm -f $auxdir/ltmain.sh $m4dir/ltversion.m4
 $MAKE ./$auxdir/ltmain.sh ./$m4dir/ltversion.m4 \
     ./libtoolize.in ./tests/defs.in ./tests/package.m4 \
     ./tests/testsuite ./libltdl/Makefile.am ./doc/notes.txt \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \
-    PACKAGE_BUGREPORT="address@hidden" M4SH="$AUTOM4TE --language=m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    PACKAGE_NAME="$PACKAGE_NAME" PACKAGE_URL="$PACKAGE_URL" \
+    PACKAGE_BUGREPORT="address@hidden" M4SH="$AUTOM4TE --language=m4sh" \
     AUTOTEST="$AUTOM4TE --language=autotest" SED="$SED" MAKEINFO="$MAKEINFO" \
     GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 test -f clcommit.m4sh && $MAKE -f Makefile.maint ./commit \
-    srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \
+    srcdir=. top_srcdir=. PACKAGE="$PACKAGE" VERSION="$VERSION" \
+    M4SH="$AUTOM4TE -l m4sh" \
     SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S"
 
 rm -f Makefile
diff --git a/libltdl/config/announce-gen.m4sh b/libltdl/config/announce-gen.m4sh
index a528fef..38e6232 100644
--- a/libltdl/config/announce-gen.m4sh
+++ b/libltdl/config/announce-gen.m4sh
@@ -99,7 +99,7 @@ test -d "$top_srcdir" || top_srcdir='@top_srcdir@'
 
 # Initialisation:
 mailnotify_flags=
-package_name="@PACKAGE_NAME@"
+package_name="@PACKAGE@"
 sendmail_to=
 valid_release_types='alpha,beta,release-candidate,stable'
 
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 99784b4..acb6e25 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -516,12 +516,9 @@ func_ltwrapper_executable_p ()
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-       func_dirname_and_basename "$1" "" "."
-       func_stripname '' '.exe' "$func_basename_result"
-       
func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    
func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file


hooks/post-receive
-- 
GNU Libtool