[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-315-gdbbcbfc

[Peter Rosin]

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=dbbcbfc98b50ea2ad1f3be75e4f3719b316e38fe

The branch, master has been updated
       via  dbbcbfc98b50ea2ad1f3be75e4f3719b316e38fe (commit)
       via  77f0a9fd4265f5b22d5686e3da27c86aee496b6d (commit)
      from  5b76e39c947d9862f786dc0eeb86553f8944dbd9 (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 dbbcbfc98b50ea2ad1f3be75e4f3719b316e38fe
Merge: 5b76e39 77f0a9f
Author: Peter Rosin <address@hidden>
Date:   Mon Aug 16 22:06:07 2010 +0200

    Merge branch 'msvc'

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

Summary of changes:
 ChangeLog   |   10 ++++++++++
 lib/compile |   22 +++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 73123f0..03662c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2010-08-16  Peter Rosin  <address@hidden>
 
+       Optimize compile script on MSYS.
+       * lib/compile (func_file_conv): Add new argument 'lazy' which
+       takes an optional list of conversion types where the requested
+       conversion isn't needed.
+       (func_cl_wrapper): Take advantage of the above for cases where
+       MSYS is doing the conversion for us.
+       Suggested by Ralf Wildenhues.
+
+2010-08-16  Peter Rosin  <address@hidden>
+
        Support more C++ file extensions for MSVC in the compile script.
        * lib/compile (func_cl_wrapper): MSVC only recognizes the .cpp
        file extension as C++, unless it's given a hint. So hint about
diff --git a/lib/compile b/lib/compile
index cd3b801..b6419ce 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2010-08-16.07; # UTC
+scriptversion=2010-08-16.11; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -38,9 +38,11 @@ IFS=" ""     $nl"
 
 file_conv=
 
-# func_file_conv build_file
+# func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts.
+# Currently only supports Win32 hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
 func_file_conv ()
 {
   file=$1
@@ -60,14 +62,16 @@ func_file_conv ()
            ;;
        esac
       fi
-      case $file_conv in
-       mingw)
+      case $file_conv/,$2, in
+       *,$file_conv,*)
+         ;;
+       mingw/*)
          file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
          ;;
-       cygwin)
+       cygwin/*)
          file=`cygpath -m "$file" || echo "$file"`
          ;;
-       wine)
+       wine/*)
          file=`winepath -w "$file" || echo "$file"`
          ;;
       esac
@@ -104,7 +108,7 @@ func_cl_wrapper ()
          esac
          ;;
        -I*)
-         func_file_conv "${1#-I}"
+         func_file_conv "${1#-I}" mingw
          set x "$@" -I"$file"
          shift
          ;;
@@ -139,7 +143,7 @@ func_cl_wrapper ()
          shift
          ;;
        *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib)
-         func_file_conv "$1"
+         func_file_conv "$1" mingw
          set x "$@" "$file"
          shift
          ;;


hooks/post-receive
-- 
GNU Automake