configure: Disable tools by default when cross-compiling.

This commit is contained in:
Alexandre Julliard 2013-10-04 14:37:16 +02:00
parent fbcf83f79c
commit 1970edd285
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -4292,7 +4292,6 @@ then
enable_fonts=${enable_fonts:-no} enable_fonts=${enable_fonts:-no}
enable_server=${enable_server:-no} enable_server=${enable_server:-no}
enable_tools=${enable_tools:-no}
elif test "x$enable_win64" = "xyes" elif test "x$enable_win64" = "xyes"
then then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
@ -4318,6 +4317,7 @@ else
/*) ;; /*) ;;
*) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac esac
enable_tools=${enable_tools:-no}
else else
as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5
fi fi

View File

@ -197,7 +197,6 @@ then
AC_SUBST([WOW64_DISABLE],[\#]) AC_SUBST([WOW64_DISABLE],[\#])
enable_fonts=${enable_fonts:-no} enable_fonts=${enable_fonts:-no}
enable_server=${enable_server:-no} enable_server=${enable_server:-no}
enable_tools=${enable_tools:-no}
elif test "x$enable_win64" = "xyes" elif test "x$enable_win64" = "xyes"
then then
test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" 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" ;; *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;;
esac esac
enable_tools=${enable_tools:-no}
else else
AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir])
fi]) fi])