Cleanup sdk selection.  Turn on all sdks by default, and remove r4797 changes.

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5180 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/configure

diff --git a/mingw-w64-headers/configure b/mingw-w64-headers/configure
index dc63185..459acb2 100755
--- a/mingw-w64-headers/configure
+++ b/mingw-w64-headers/configure
@@ -1315,7 +1315,7 @@
                           sometimes confusing) to the casual installer
   --disable-crt           Do not use the default crt headers
   --enable-sdk=ARG        Add the desired SDK, where ARG can be one of ddk,
-                          directx, no or all
+                          directx, no or all. Default is all.
   --enable-idl            Enable installing idl files (default disabled)
   --enable-secure-api     Enable secure API by default
 
@@ -2568,40 +2568,20 @@
 
 
 
-enable_directx=no
-enable_ddk=no
-
-if test -d ${srcdir}/ddk/include/ddk
-then
-    # DDK headers have been fetched from ReactOS
-    ddk_present=yes
-else
-    # DDK heaers are absent
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: svn checkout incomplete, ddk headers missing." >&5
-$as_echo "$as_me: WARNING: svn checkout incomplete, ddk headers missing." >&2;}
-    ddk_present=no
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional sdk headers" >&5
 $as_echo_n "checking for optional sdk headers... " >&6; }
 # Check whether --enable-sdk was given.
 if test "${enable_sdk+set}" = set; then :
   enableval=$enable_sdk;
 else
-
-  if test "${ddk_present}" = no
-  then
-    enable_sdk=directx
-  else
-    enable_sdk=all
-  fi
-
+  enable_sdkall=
 fi
 
+
 case $enable_sdk in #(
   all|yes) :
 
-    enable_sdk="ddk,directx"
+    enable_sdk=ddk,directx
     enable_ddk=yes
     enable_directx=yes ;; #(
   ddk) :

mingw-w64-headers/configure.ac

diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
index f2f2427..bce1ac0 100644
--- a/mingw-w64-headers/configure.ac
+++ b/mingw-w64-headers/configure.ac
@@ -67,41 +67,22 @@
 AC_SUBST([SECHEAD_LIST])
 AC_SUBST([SECSYSHEAD_LIST])
 
-enable_directx=no
-enable_ddk=no
-
-if test -d ${srcdir}/ddk/include/ddk
-then
-    # DDK headers have been fetched from ReactOS
-    ddk_present=yes
-else
-    # DDK heaers are absent
-    AC_MSG_WARN([svn checkout incomplete, ddk headers missing.])
-    ddk_present=no
-fi
-
 AC_MSG_CHECKING([for optional sdk headers])
 AC_ARG_ENABLE([sdk],
   [AS_HELP_STRING([--enable-sdk=ARG],
-    [Add the desired SDK, where ARG can be one of ddk, directx, no or all])],
+    [Add the desired SDK, where ARG can be one of ddk, directx, no or all.  Default is all.])],
   [],
-  [
-  if test "${ddk_present}" = no
-  then
-    enable_sdk=directx
-  else
-    enable_sdk=all
-  fi
-  ])
+  [AS_VAR_SET([enable_sdk][all])])
+
 AS_CASE([$enable_sdk],
   [all|yes],[
-    enable_sdk="ddk,directx"
-    enable_ddk=yes
-    enable_directx=yes],
+    AS_VAR_SET([enable_sdk],[ddk,directx])
+    AS_VAR_SET([enable_ddk],[yes])
+    AS_VAR_SET([enable_directx],[yes])],
   [ddk],[
-    enable_ddk=yes],
+    AS_VAR_SET([enable_ddk],[yes])],
   [directx],[
-    enable_directx=yes],
+    AS_VAR_SET([enable_directx],[yes])],
   [no],[],
   [AC_MSG_ERROR([Invalid option: $enable_sdk.  Please choose one of ddk, directx, no or all.])])
 AC_MSG_RESULT([$enable_sdk])