[SCM] GNU Libtool branch, sysroot, updated. v2.2.10-106-g75b9ac5

[Paolo Bonzini]

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, sysroot has been updated
       via  75b9ac5fa27c4940141d719a42a07f4397e14c60 (commit)
       via  a662d7c46eb9a5734e6356049ccc82e28dbffbf4 (commit)
       via  a1d74f242cae77a941fbaa0505badf488d85f618 (commit)
      from  2bde23f84fd69c2b135ef53f43a22a90c14e7e8c (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 75b9ac5fa27c4940141d719a42a07f4397e14c60
Merge: a1d74f2 a662d7c
Author: Paolo Bonzini <address@hidden>
Date:   Sun Aug 22 09:54:55 2010 +0200

    Merge branch 'master' into sysroot

commit a1d74f242cae77a941fbaa0505badf488d85f618
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Aug 22 09:42:51 2010 +0200

    fix AIX testsuite regression
    
    * libltdl/config/ltmain.m4sh (func_resolve_sysroot): Partly
    revert v2.2.10-83-gc45a288: Do not absolutize path here, only do
    sysroot replacement.
    (func_mode_link): Adjust.

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

Summary of changes:
 ChangeLog                   |    6 ++++++
 libltdl/config/general.m4sh |    2 +-
 libltdl/config/ltmain.m4sh  |   29 ++++++++++++-----------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9892427..5f5e23a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-22  Paolo Bonzini  <address@hidden>
+
+       Fix sed_make_literal_regex.
+       * libltdl/config/general.m4sh (sed_make_literal_regex): Fix
+       definition.
+
 2010-08-15  Paolo Bonzini  <address@hidden>
 
        Factor the sed command used to make a regex from a literal.
diff --git a/libltdl/config/general.m4sh b/libltdl/config/general.m4sh
index 1ccb9b0..595c57a 100644
--- a/libltdl/config/general.m4sh
+++ b/libltdl/config/general.m4sh
@@ -317,7 +317,7 @@ double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
 # Sed substitution that turns a string into a regex matching for the
 # string literally.
-sed_make_literal_regex='s,[].[^$\\*/],\\\\&,g'
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
 
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 460897c..f23878e 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -547,31 +547,16 @@ func_source ()
 
 
 # func_resolve_sysroot PATH
-# Change PATH to an absolute path or replace a leading = with a
-# sysroot.  Store the result into func_resolve_sysroot_result
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
 func_resolve_sysroot ()
 {
   func_resolve_sysroot_result=$1
   case $func_resolve_sysroot_result in
-  [\\/]* | [A-Za-z]:[\\/]*) ;;
   =*)
     func_stripname '=' '' "$func_resolve_sysroot_result"
     func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
     ;;
-  *)
-    if test -d "$1"; then
-      absdir=`cd "$1" && pwd`
-      test -z "$absdir" && \
-        func_fatal_error "cannot determine absolute directory name of \`$dir'"
-      func_resolve_sysroot_result=`cd "$dir" && pwd`
-    else
-      func_dirname_and_basename "$1" "" "."
-      absdir=`cd "$func_dirname_result" && pwd`
-      test -z "$absdir" && \
-        func_fatal_error "cannot determine absolute directory name of 
\`$func_dirname_result'"
-      func_resolve_sysroot_result="$absdir/$func_basename_result"
-    fi
-    ;;
   esac
 }
 
@@ -4443,6 +4428,16 @@ func_mode_link ()
        fi
        func_resolve_sysroot "$func_stripname_result"
        dir=$func_resolve_sysroot_result
+       # We need an absolute path.
+       case $dir in
+       [\\/]* | [A-Za-z]:[\\/]*) ;;
+       *)
+         absdir=`cd "$dir" && pwd`
+         test -z "$absdir" && \
+           func_fatal_error "cannot determine absolute directory name of 
\`$dir'"
+         dir="$absdir"
+         ;;
+       esac
        case "$deplibs " in
        *" -L$dir "* | *" $arg "*)
          # Will only happen for absolute or sysroot arguments


hooks/post-receive
-- 
GNU Libtool