---
 mingw-w64-headers/configure |   86 +++++++++++++++++++++----------------------
 1 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/mingw-w64-headers/configure b/mingw-w64-headers/configure
index 7a5925b..ab1f432 100755
--- a/mingw-w64-headers/configure
+++ b/mingw-w64-headers/configure
@@ -666,7 +666,9 @@ enable_option_checking
 enable_maintainer_mode
 with_widl
 enable_crt
-enable_sdk
+enable_directx
+enable_ddk
+enable_idl
 enable_secure_api
 '
       ac_precious_vars='build_alias
@@ -1296,8 +1298,10 @@ Optional Features:
   --enable-maintainer-mode  enable make rules and dependencies not useful
                          (and 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, idl or all
+  --disable-directx       Disable DirectX SDK headers (default enabled)
+  --disable-ddk           Disable DDK SDK headers (default enabled)
+  --enable-idl            Enable generation of headers via idl in
+                          maintainer-mode (default disabled)
   --enable-secure-api     Enable secure API by default
 
 Optional Packages:
@@ -2556,69 +2560,63 @@ MINGWHELPERHEAD_LIST=$srcdir/include/psdk_inc/*.h
 
 
 
-enable_directx=no
-enable_ddk=no
-enable_idl=no
-
-{ $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
-  enable_sdk=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if directx sdk headers are 
enabled" >&5
+$as_echo_n "checking if directx sdk headers are enabled... " >&6; }
+# Check whether --enable-directx was given.
+if test "${enable_directx+set}" = set; then :
+  enableval=$enable_directx;
 fi
 
-case $enable_sdk in #(
-  all|yes) :
-
-    enable_sdk="ddk,directx,idl"
-    enable_ddk=yes
-    enable_directx=yes ;; #(
-  ddk) :
+test -z "$enable_directx" && enable_directx="yes"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_directx" >&5
+$as_echo "$enable_directx" >&6; }
+if test "x$enable_directx" = xno; then :
 
-    enable_ddk=yes ;; #(
-  directx) :
-
-    enable_directx=yes ;; #(
-  idl) :
-
-    enable_idl=yes ;; #(
-  no) :
-     ;; #(
-  *) :
-    as_fn_error $? "Invalid option: $enable_sdk.  Please choose one of ddk, 
directx, idl or all." "$LINENO" 5 ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_sdk" >&5
-$as_echo "$enable_sdk" >&6; }
+    MINGW_HAS_DX=0
 
-if test "x$enable_directx" = xyes; then :
+else
 
     DXHEAD_LIST=$srcdir/direct-x/include/*.[hi]*
     MINGW_HAS_DX=1
 
-else
+fi
+
 
-    MINGW_HAS_DX=0
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ddk sdk headers are 
enabled" >&5
+$as_echo_n "checking if ddk sdk headers are enabled... " >&6; }
+# Check whether --enable-ddk was given.
+if test "${enable_ddk+set}" = set; then :
+  enableval=$enable_ddk;
 fi
 
+test -z "$enable_ddk" && enable_ddk="yes"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ddk" >&5
+$as_echo "$enable_ddk" >&6; }
+if test "x$enable_ddk" = xno; then :
 
+    MINGW_HAS_DDK=0
 
-if test "x$enable_ddk" = xyes; then :
+else
 
     DDKHEAD_LIST=$srcdir/ddk/include/ddk/*.h
     MINGW_HAS_DDK=1
 
-else
-
-    MINGW_HAS_DDK=0
-
 fi
 
 
 
-if test "x$enable_idl" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if headers generation via 
idl is enabled" >&5
+$as_echo_n "checking if headers generation via idl is enabled... " >&6; }
+# Check whether --enable-idl was given.
+if test "${enable_idl+set}" = set; then :
+  enableval=$enable_idl;
+fi
+
+test -z "$enable_idl" && enable_idl="no"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_idl" >&5
+$as_echo "$enable_idl" >&6; }
+if test "x$enable_idl" = xno; then :
 
     IDLHEAD_LIST=$srcdir/idl/*.idl
 fi
-- 
1.7.8.3

------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public

Reply via email to