[SCM] GNU Libtool branch, master, updated. v2.2.4-17-gaedb76f

[Charles Wilson]

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  aedb76fb8646da7732cc573893053161b2794024 (commit)
      from  154ca8a7087116d45e7e66d218d5d84f02708ebb (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 aedb76fb8646da7732cc573893053161b2794024
Author: Charles Wilson <address@hidden>
Date:   Sat May 31 13:11:58 2008 -0400

    [mingw] fix cross-compile-with-wine case
    
    * libltdl/config/ltmain.m4sh (func_to_host_path)
    [host=mingw, build!=mingw|cygwin]: check that winepath
    stdout is non-empty and exit code is 0, instead of checking
    stderr.
    Reported by: Roumen Petrov

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

Summary of changes:
 ChangeLog                  |   11 ++++++++++-
 libltdl/config/ltmain.m4sh |   20 +++++++++++---------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6dc24f3..92b3214 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-2006-05-01  Stas Maximov  <address@hidden>  (tiny change)
+2008-06-01  Charles Wilson  <address@hidden>
+
+       [mingw] fix cross-compile-with-wine case
+       * libltdl/config/ltmain.m4sh (func_to_host_path)
+       [host=mingw, build!=mingw|cygwin]: check that winepath
+       stdout is non-empty and exit code is 0, instead of checking
+       stderr.
+       Reported by: Roumen Petrov
+
+2006-06-01  Stas Maximov  <address@hidden>  (tiny change)
 
        Check only regular files, not devices, for lalibs.
        * libltdl/config/ltmain.m4sh (functions func_lalib_p)
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 84977a0..b6fb29b 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -2556,17 +2556,19 @@ func_to_host_path ()
             ;;
           * )
             # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check stderr for an
-            # error message. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127. So we
-            # must check for both, which explains the odd construction:
-            func_to_host_path_winepath_stderr=`winepath -w "$1" >/dev/null 
2>&1`
-            func_to_host_path_winepath_exitcode=$?
-            if test "$func_to_host_path_winepath_exitcode" -eq 0 &&\
-               test -z "${func_to_host_path_winepath_stderr}" ; then
-              func_to_host_path_tmp1=`winepath -w "$1"`
+            # error code, so we are forced to check the contents of
+            # stdout. On the other hand, if the command is not
+            # found, the shell will set an exit code of 127 and print
+            # *an error message* to stdout. So we must check for both
+            # error code of zero AND non-empty stdout, which explains
+            # the odd construction:
+            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+            if test $? -eq 0 && test -n "${func_to_host_path_tmp1}"; then
               func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
                 $SED -e "$lt_sed_naive_backslashify"`
+            else
+              # Allow warning below.
+              func_to_host_path_result=""
             fi
             ;;
         esac


hooks/post-receive
--
GNU Libtool