Fix sdks missing header hacks.

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

mingw-w64-headers/Makefile.am

diff --git a/mingw-w64-headers/Makefile.am b/mingw-w64-headers/Makefile.am
index d39181d..2ba7043 100644
--- a/mingw-w64-headers/Makefile.am
+++ b/mingw-w64-headers/Makefile.am
@@ -11,8 +11,7 @@
 sechead_HEADERS = @SECHEAD_LIST@
 secsyshead_HEADERS = @SECSYSHEAD_LIST@
 glhead_HEADERS = @GLHEAD_LIST@
-sdkshead_HEADERS = @SDKSHEAD_LIST@
-
+sdkshead_HEADERS = _mingw_directx.h _mingw_ddk.h
 
 ddkheaddir = $(baseheaddir)/ddk
 dxheaddir = $(baseheaddir)
@@ -22,7 +21,6 @@
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-sdk=all
 
-
 EXTRA_HEADERS = \
   include/*.c \
   include/*.dlg \
@@ -37,3 +35,12 @@
   crt/sec_api/*.h \
   crt/sec_api/sys/*.h
 
+BUILT_SOURCES = \
+  _mingw_directx.h \
+  _mingw_ddk.h
+
+_mingw_directx.h: $(srcdir)/crt/sdks/_mingw_directx.h.in
+	$(SED) s/MINGW_HAS_DX$$/@MINGW_HAS_DX@/ $< > $@
+
+_mingw_ddk.h: $(srcdir)/crt/sdks/_mingw_ddk.h.in
+	$(SED) s/MINGW_HAS_DDK$$/@MINGW_HAS_DDK@/ $< > $@

mingw-w64-headers/configure.ac

diff --git a/mingw-w64-headers/configure.ac b/mingw-w64-headers/configure.ac
index 1b72b9e..3761420 100644
--- a/mingw-w64-headers/configure.ac
+++ b/mingw-w64-headers/configure.ac
@@ -12,6 +12,7 @@
 AC_CANONICAL_HOST
 
 # Checks for programs.
+AC_PROG_SED
 
 # Checks for libraries.
 
@@ -36,7 +37,6 @@
   SYSHEAD_LIST=$srcdir/crt/sys/*.h
   SECHEAD_LIST=$srcdir/crt/sec_api/*.h
   SECSYSHEAD_LIST=$srcdir/crt/sec_api/sys/*.h
-dnl  SDKSHEAD_LIST=$srcdir/crt/sdks/*.h
 ])
 GLHEAD_LIST=$srcdir/include/GL/*.h
 AC_SUBST([BASEHEAD_LIST])
@@ -44,7 +44,6 @@
 AC_SUBST([SYSHEAD_LIST])
 AC_SUBST([SECHEAD_LIST])
 AC_SUBST([SECSYSHEAD_LIST])
-AC_SUBST([SDKSHEAD_LIST])
 
 AC_MSG_CHECKING([for optional sdk headers])
 AC_ARG_ENABLE([sdk],
@@ -75,12 +74,7 @@
 AS_IF([test $enable_directx = yes],[
   DXHEAD_LIST=$srcdir/direct-x/include/*.[[hi]]*
   MINGW_HAS_DX=1],
-  [
-#FIXME
-SDKSHEAD_LIST=$srcdir/defaults/include/sdks/*.h
-MINGW_HAS_DX=1
-#ENDFIXME Get rid of this hack!
-])
+  [])
 AC_SUBST([DXHEAD_LIST])
 AC_SUBST([MINGW_HAS_DX])
 
@@ -95,5 +89,5 @@
 
 # Checks for library functions.
 
-AC_CONFIG_FILES([Makefile crt/sdks/_mingw_directx.h crt/sdks/_mingw_ddk.h])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

mingw-w64-headers/crt/sdks/_mingw_ddk.h.in

diff --git a/mingw-w64-headers/crt/sdks/_mingw_ddk.h.in b/mingw-w64-headers/crt/sdks/_mingw_ddk.h.in
index 564e2e8..0978edd 100644
--- a/mingw-w64-headers/crt/sdks/_mingw_ddk.h.in
+++ b/mingw-w64-headers/crt/sdks/_mingw_ddk.h.in
@@ -1,6 +1,6 @@
 #ifndef MINGW_DDK_H
 #define MINGW_DDK_H
-#if @MINGW_HAS_DDK@
+#if MINGW_HAS_DDK
 #define MINGW_HAS_DDK_H 1
 #endif
 #endif

mingw-w64-headers/crt/sdks/_mingw_directx.h.in

diff --git a/mingw-w64-headers/crt/sdks/_mingw_directx.h.in b/mingw-w64-headers/crt/sdks/_mingw_directx.h.in
index 3cfb992..2f80de2 100644
--- a/mingw-w64-headers/crt/sdks/_mingw_directx.h.in
+++ b/mingw-w64-headers/crt/sdks/_mingw_directx.h.in
@@ -1,4 +1,4 @@
-#if @MINGW_HAS_DX@
+#if MINGW_HAS_DX
 #ifndef MINGW_HAS_DDRAW_H
 
 #define MINGW_HAS_DDRAW_H 1