Alexandre Julliard : configure: Allow out-of-tree builds from an unclean source tree.

Alexandre Julliard julliard at winehq.org
Wed Jan 22 14:52:59 CST 2020


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jan 21 20:59:15 2020 +0100

configure: Allow out-of-tree builds from an unclean source tree.

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

---

 configure    | 8 --------
 configure.ac | 9 ---------
 2 files changed, 17 deletions(-)

diff --git a/configure b/configure
index 3125c4444d..7ff3737bda 100755
--- a/configure
+++ b/configure
@@ -4288,14 +4288,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
-case "$srcdir" in
- .) ;;
- *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then
-      as_fn_error $? "you are building out of the source tree, but the source tree contains object files.
-You need to run 'make distclean' in the source tree first." "$LINENO" 5
-    fi ;;
-esac
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
diff --git a/configure.ac b/configure.ac
index 5e36331596..681d315eed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,15 +117,6 @@ AC_ARG_WITH(wine64,    AS_HELP_STRING([--with-wine64=DIR],[use the 64-bit Wine i
 
 AC_CANONICAL_HOST
 
-dnl check for out of tree build with unclean source tree
-case "$srcdir" in
- .) ;;
- *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then
-      AC_MSG_ERROR([you are building out of the source tree, but the source tree contains object files.
-You need to run 'make distclean' in the source tree first.])
-    fi ;;
-esac
-
 dnl **** Check for some programs ****
 
 AC_PROG_MAKE_SET




More information about the wine-cvs mailing list