[SCM] GNU Libtool branch, master, updated. v2.2.6-93-g5f24ee1

[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  5f24ee188d215eb1f54b138000010a0f04e4bb7f (commit)
       via  6d08820f7c04dc7269c40ac01bc844e3fedde624 (commit)
       via  f4788a1ba6fbbbdd90695661e79094c7071ad193 (commit)
       via  a967d9d23b2a0b095497e54fbb35f36976af19b9 (commit)
      from  af91ea10b4af5fbf5ed5b2010295fef61cfdcf97 (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 5f24ee188d215eb1f54b138000010a0f04e4bb7f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Feb 1 15:05:37 2009 +0100

    Fix sed script in install.at.
    
    * tests/install.at (Install tests): Fix typo in sed script,
    fixes test failure on HP-UX.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 6d08820f7c04dc7269c40ac01bc844e3fedde624
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Feb 1 15:06:03 2009 +0100

    Fix $INSTALL in testsuite with relative path to install-sh.
    
    * tests/testsuite.at: If `$INSTALL' points to in-tree
    install-sh, override a possibly-relative path to it with an
    absolute one.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit f4788a1ba6fbbbdd90695661e79094c7071ad193
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Feb 1 15:06:19 2009 +0100

    install mode: do not pass `-m $install_override_mode' to cp.
    
    * libltdl/config/ltmain.m4sh (func_mode_install): New variable
    $install_cp, factor test when `cp' is used for installation.
    Do not pass mode override to cp.  Fixes `libtool --mode=install
    cp ...' on HP-UX; cp should not be used for libraries that might
    be needed by programs invoked during the installation process.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit a967d9d23b2a0b095497e54fbb35f36976af19b9
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Feb 1 15:24:00 2009 +0100

    Fix sed script portability issue in func_version.
    
    * libltdl/config/getopt.m4sh (func_version): Remove space in
    `/\./! {' sed command, to please HP-UX sed.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

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

Summary of changes:
 ChangeLog                  |   22 ++++++++++++++++++++++
 libltdl/config/getopt.m4sh |    2 +-
 libltdl/config/ltmain.m4sh |   17 +++++++++++------
 tests/install.at           |    4 ++--
 tests/testsuite.at         |    6 ++++++
 5 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7fb1de3..ab8db82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2009-02-01  Ralf Wildenhues  <address@hidden>
+
+       Fix sed script in install.at.
+       * tests/install.at (Install tests): Fix typo in sed script,
+       fixes test failure on HP-UX.
+
+       Fix $INSTALL in testsuite with relative path to install-sh.
+       * tests/testsuite.at: If `$INSTALL' points to in-tree
+       install-sh, override a possibly-relative path to it with an
+       absolute one.
+
+       install mode: do not pass `-m $install_override_mode' to cp.
+       * libltdl/config/ltmain.m4sh (func_mode_install): New variable
+       $install_cp, factor test when `cp' is used for installation.
+       Do not pass mode override to cp.  Fixes `libtool --mode=install
+       cp ...' on HP-UX; cp should not be used for libraries that might
+       be needed by programs invoked during the installation process.
+
+       Fix sed script portability issue in func_version.
+       * libltdl/config/getopt.m4sh (func_version): Remove space in
+       `/\./! {' sed command, to please HP-UX sed.
+
 2009-01-31  Jeff Squyres <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/libltdl/config/getopt.m4sh b/libltdl/config/getopt.m4sh
index 5f20320..d0f92f6 100644
--- a/libltdl/config/getopt.m4sh
+++ b/libltdl/config/getopt.m4sh
@@ -38,7 +38,7 @@ func_version ()
 {
     $SED -n '/(C)/!b go
        :more
-       /\./! {
+       /\./!{
          N
          s/\n# //
          b more
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index d685d30..49e07c3 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1470,6 +1470,10 @@ func_mode_install ()
     func_quote_for_eval "$arg"
     install_prog="$install_prog$func_quote_for_eval_result"
     install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1492,10 +1496,9 @@ func_mode_install ()
       case $arg in
       -d) isdir=yes ;;
       -f)
-       case " $install_prog " in
-       *[\\\ /]cp\ *) ;;
-       *) prev=$arg ;;
-       esac
+       if $install_cp; then :; else
+         prev=$arg
+       fi
        ;;
       -g | -m | -o)
        prev=$arg
@@ -1537,8 +1540,10 @@ func_mode_install ()
       func_fatal_help "the \`$prev' option requires an argument"
 
     if test -n "$install_override_mode" && $no_mode; then
-      func_quote_for_eval "$install_override_mode"
-      install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+      if $install_cp; then :; else
+       func_quote_for_eval "$install_override_mode"
+       install_shared_prog="$install_shared_prog -m 
$func_quote_for_eval_result"
+      fi
     fi
 
     if test -z "$files"; then
diff --git a/tests/install.at b/tests/install.at
index f77970e..1e944e5 100644
--- a/tests/install.at
+++ b/tests/install.at
@@ -1,6 +1,6 @@
 # install.at -- install mode tests             -*- Autotest -*-
 #
-#   Copyright (C) 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -30,7 +30,7 @@ AT_KEYWORDS([libtool])
 
 AT_CHECK([$LIBTOOL --features | grep 'enable shared libraries' || exit 77],
         [], [ignore])
-sed 's,^\(install_override_mode=\).*,&755,' < $LIBTOOL > ./libtool
+sed 's,^\(install_override_mode\)=.*,\1=755,' < $LIBTOOL > ./libtool
 LIBTOOL=./libtool
 chmod a+rx $LIBTOOL
 
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 92e786e..0929849 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -52,6 +52,12 @@ else
   unset=false
 fi
 : ${mkdir_p="$abs_top_srcdir/libltdl/config/install-sh -d"}
+# Fix relative paths in $INSTALL
+case $INSTALL in
+  *libltdl/config/install-sh*)
+    INSTALL=$abs_top_srcdir/libltdl/config/install-sh
+    ;;
+esac
 
 # On AIX, shared libraries remain loaded in memory after use if they
 # are world-readable, until root issues slibclean.  On NFS, this causes


hooks/post-receive
--
GNU Libtool