Alexandre Julliard : configure: Allow building a WoW64 tree inside the source directory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1582ae6b045bb1658f6d5bc83efc5f6ce042c06e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1582ae6b045bb1658f6d5bc83...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Nov 28 20:55:13 2018 +0100

configure: Allow building a WoW64 tree inside the source directory.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 configure    | 11 ++---------
 configure.ac | 13 +++----------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/configure b/configure
index f7c1158..d00057b 100755
--- a/configure
+++ b/configure
@@ -5648,17 +5648,10 @@ enable_win64=${enable_win64:-no}
 
 enable_winetest=${enable_winetest:-$enable_tests}
 
-if test -n "$with_wine64"
+if test "x$enable_win64" = "xyes"
 then
-    if test "x$enable_win64" = "xyes"
-    then
-        as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
+    test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
 --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree." "$LINENO" 5
-    fi
-    test "$srcdir" != . || as_fn_error $? "--with-wine64 cannot be used when building inside the source tree.
-You should create a separate build directory and run configure from there." "$LINENO" 5
-elif test "x$enable_win64" = "xyes"
-then
     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
 fi
 
diff --git a/configure.ac b/configure.ac
index c909ce4..50cf9a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,18 +225,11 @@ enable_win64=${enable_win64:-no}
 dnl Disable winetest too if tests are disabled
 enable_winetest=${enable_winetest:-$enable_tests}
 
-dnl Some special cases for the wow64 build
-if test -n "$with_wine64"
+dnl Some special cases for the 64-bit build
+if test "x$enable_win64" = "xyes"
 then
-    if test "x$enable_win64" = "xyes"
-    then
-        AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive.
+    test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive.
 --enable-win64 should be used in the 64-bit build tree, --with-wine64 in the 32-bit Wow64 build tree.])
-    fi
-    test "$srcdir" != . || AC_MSG_ERROR([--with-wine64 cannot be used when building inside the source tree.
-You should create a separate build directory and run configure from there.])
-elif test "x$enable_win64" = "xyes"
-then
     test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
 fi