Module: wine Branch: master Commit: 1970edd2855ea712dc0070ab70963eb5d4f29cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1970edd2855ea712dc0070ab70...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 4 14:37:16 2013 +0200
configure: Disable tools by default when cross-compiling.
---
configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure index 4154b43..0ceb931 100755 --- a/configure +++ b/configure @@ -4292,7 +4292,6 @@ then
enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} - enable_tools=${enable_tools:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x${exec_prefix}/lib" || libdir="${exec_prefix}/lib64" @@ -4318,6 +4317,7 @@ else /*) ;; *) wine_cv_toolsdir="$(top_builddir)/$wine_cv_toolsdir" ;; esac + enable_tools=${enable_tools:-no} else as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 708197a..d362611 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,6 @@ then AC_SUBST([WOW64_DISABLE],[#]) enable_fonts=${enable_fonts:-no} enable_server=${enable_server:-no} - enable_tools=${enable_tools:-no} elif test "x$enable_win64" = "xyes" then test "x$libdir" != "x${exec_prefix}/lib" || libdir="${exec_prefix}/lib64" @@ -219,6 +218,7 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, /*) ;; *) wine_cv_toolsdir="$(top_builddir)/$wine_cv_toolsdir" ;; esac + enable_tools=${enable_tools:-no} else AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi])