From e48720236a096db328b060da651f8108b1154375 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 28 Dec 2013 13:37:34 +0100
Subject: [PATCH] configure: Don't create cross-compiled import libraries for
 16-bit modules.

---
 aclocal.m4 | 6 +++---
 configure  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 300196bfc65..7760a201b54 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -471,7 +471,7 @@ $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
         fi
 
-        if test -n "$CROSSTARGET"
+        if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
         then
             wine_fn_append_rule \
 "__builddeps__: $ac_file.cross.a
@@ -494,7 +494,7 @@ $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 install install-dev:: $ac_dir/install-dev
 __uninstall__: $ac_dir/uninstall"
-        if test -n "$CROSSTARGET"
+        if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
         then
             wine_fn_append_rule \
 "__builddeps__: $ac_file.cross.a
@@ -511,7 +511,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
 clean::
 	\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
             wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT"
-            if test -n "$CROSSTARGET"
+            if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
             then
                 wine_fn_append_rule \
 "__builddeps__: dlls/lib$ac_implib.cross.a
diff --git a/configure b/configure
index 50d5966d56c..f56f46ad5f4 100755
--- a/configure
+++ b/configure
@@ -7344,7 +7344,7 @@ $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT"
         fi
 
-        if test -n "$CROSSTARGET"
+        if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
         then
             wine_fn_append_rule \
 "__builddeps__: $ac_file.cross.a
@@ -7367,7 +7367,7 @@ $ac_dir/uninstall::
 	\$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT
 install install-dev:: $ac_dir/install-dev
 __uninstall__: $ac_dir/uninstall"
-        if test -n "$CROSSTARGET"
+        if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
         then
             wine_fn_append_rule \
 "__builddeps__: $ac_file.cross.a
@@ -7384,7 +7384,7 @@ dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT
 clean::
 	\$(RM) dlls/lib$ac_implib.$IMPLIBEXT"
             wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT"
-            if test -n "$CROSSTARGET"
+            if test -n "$CROSSTARGET" -a -z "$ac_implibflags"
             then
                 wine_fn_append_rule \
 "__builddeps__: dlls/lib$ac_implib.cross.a