Alexandre Julliard : configure: Don' t allow doing a 32-bit Wow64 build from inside the source tree.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Nov 20 07:48:46 CST 2015


Module: wine
Branch: master
Commit: dfe65ce13e48c2563a88f2c5687c89104f2bd391
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dfe65ce13e48c2563a88f2c5687c89104f2bd391

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Nov 20 19:27:30 2015 +0900

configure: Don't allow doing a 32-bit Wow64 build from inside the source tree.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 configure    | 2 ++
 configure.ac | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/configure b/configure
index 291966b..03f95ab 100755
--- a/configure
+++ b/configure
@@ -5069,6 +5069,8 @@ then
         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
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
 elif test "x$enable_win64" = "xyes"
diff --git a/configure.ac b/configure.ac
index bd3db26..2d2a168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -203,6 +203,8 @@ then
         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.])
     enable_fonts=${enable_fonts:-no}
     enable_server=${enable_server:-no}
 elif test "x$enable_win64" = "xyes"




More information about the wine-cvs mailing list