From 8c910fa7b55deb8df3bd7fa4353d9b3ded803525 Mon Sep 17 00:00:00 2001
From: Jan Zerebecki <jan.wine@zerebecki.de>
Date: Sat, 22 Nov 2008 20:52:08 +0100
Subject: [PATCH] push	9eb69739077a78582a49a507f9a742b569b9af91

---
 configure    | 27 ++-------------------------
 configure.ac | 15 ---------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/configure b/configure
index 7deec909677..428d38face1 100755
--- a/configure
+++ b/configure
@@ -663,7 +663,6 @@ host_vendor
 host_os
 WIN16_FILES
 WIN16_INSTALL
-WINETEST
 SET_MAKE
 CC
 CFLAGS
@@ -1388,7 +1387,6 @@ Optional Features:
   --disable-tests         do not build the regression tests
   --enable-maintainer-mode
                           enable maintainer-specific build rules
-  --disable-tests         do not build the testsuites
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2152,11 +2150,6 @@ if test "${with_wine_tools+set}" = set; then
   withval=$with_wine_tools;
 fi
 
-# Check whether --enable-tests was given.
-if test "${enable_tests+set}" = set; then
-  enableval=$enable_tests;
-fi
-
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2274,15 +2267,6 @@ then
   WIN16_INSTALL=""
 fi
 
-if test "x$enable_tests" == "xno"
-then
-  WINETEST=""
-
-else
-  WINETEST="winetest"
-
-fi
-
 case "$srcdir" in
  .) ;;
  *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then
@@ -26094,12 +26078,6 @@ tools/wrc/Makefile: tools/wrc/Makefile.in Make.rules"
 ac_config_files="$ac_config_files tools/wrc/Makefile"
 
 
-if test "x$enable_tests" == "xno"
-then
-  ALL_TEST_DIRS=""
-
-fi
-
 
 ALL_WINETEST_DEPENDS="# Test binaries"
 
@@ -27233,7 +27211,6 @@ host_vendor!$host_vendor$ac_delim
 host_os!$host_os$ac_delim
 WIN16_FILES!$WIN16_FILES$ac_delim
 WIN16_INSTALL!$WIN16_INSTALL$ac_delim
-WINETEST!$WINETEST$ac_delim
 SET_MAKE!$SET_MAKE$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
@@ -27267,6 +27244,7 @@ ARFLAGS!$ARFLAGS$ac_delim
 RANLIB!$RANLIB$ac_delim
 STRIP!$STRIP$ac_delim
 WINDRES!$WINDRES$ac_delim
+LN_S!$LN_S$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 82; then
@@ -27328,7 +27306,6 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-LN_S!$LN_S$ac_delim
 LN!$LN$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
@@ -27419,7 +27396,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index a36cde937be..7a30df04a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,6 @@ AC_ARG_WITH(xxf86vm,   AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide
             [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; fi])
 
 AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR]))
-AC_ARG_ENABLE(tests, AC_HELP_STRING([--disable-tests],[do not build the testsuites]))
 
 AC_CANONICAL_HOST
 case $host in
@@ -115,14 +114,6 @@ then
   WIN16_INSTALL=""
 fi
 
-dnl enable_tests is yes by default, but in some cases it's better to disable the testsuite
-if test "x$enable_tests" == "xno"
-then
-  AC_SUBST(WINETEST,"")
-else
-  AC_SUBST(WINETEST,"winetest")
-fi
-
 dnl check for out of tree build with unclean source tree
 case "$srcdir" in
  .) ;;
@@ -2193,12 +2184,6 @@ WINE_CONFIG_MAKEFILE([tools/winegcc/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([tools/wmc/Makefile],[Make.rules])
 WINE_CONFIG_MAKEFILE([tools/wrc/Makefile],[Make.rules])
 
-dnl enable_tests is yes by default, but in some cases it's better to disable the testsuite
-if test "x$enable_tests" == "xno"
-then
-  AC_SUBST(ALL_TEST_DIRS,"")
-fi
-
 dnl Build dependencies for test files compiled into winetest
 
 AC_SUBST(ALL_WINETEST_DEPENDS,["# Test binaries"])
-- 
2.11.4.GIT