ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-11-28 20:55:13 +01:00
parent 123b92373d
commit 1582ae6b04
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -5648,17 +5648,10 @@ enable_win64=${enable_win64:-no}
enable_winetest=${enable_winetest:-$enable_tests} enable_winetest=${enable_winetest:-$enable_tests}
if test -n "$with_wine64" if test "x$enable_win64" = "xyes"
then then
if test "x$enable_win64" = "xyes" test -z "$with_wine64" || as_fn_error $? "--enable-win64 and --with-wine64 are mutually exclusive.
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 --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" test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
fi fi

13
configure.ac
View File

@ -225,18 +225,11 @@ enable_win64=${enable_win64:-no}
dnl Disable winetest too if tests are disabled dnl Disable winetest too if tests are disabled
enable_winetest=${enable_winetest:-$enable_tests} enable_winetest=${enable_winetest:-$enable_tests}
dnl Some special cases for the wow64 build dnl Some special cases for the 64-bit build
if test -n "$with_wine64" if test "x$enable_win64" = "xyes"
then then
if test "x$enable_win64" = "xyes" test -z "$with_wine64" || AC_MSG_ERROR([--enable-win64 and --with-wine64 are mutually exclusive.
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.]) --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" test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
fi fi