]> git.saurik.com Git - wxWidgets.git/commitdiff
include <windows.h> in tests for multimon.h, ddraw.h and dshow.h as otherwise they...
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 12 Dec 2004 11:01:39 +0000 (11:01 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 12 Dec 2004 11:01:39 +0000 (11:01 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

index ae5b076c90337cf255e365f49e5e886e646b2521..445de1655b98fe4baa2665e28bcfb834e9fa88d0 100644 (file)
@@ -3201,10 +3201,12 @@ dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
 dnl DirectDraw  / Multimon for MSW
 dnl ---------------------------------------------------------------------------
-        AC_CHECK_HEADERS([multimon.h ddraw.h], [], [
-            wxUSE_DISPLAY="no"
-            AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
-          ] )
+        AC_CHECK_HEADERS([multimon.h ddraw.h], [],
+            [
+                wxUSE_DISPLAY="no"
+                AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
+            ],
+            [#include <windows.h>])
     fi
 fi
 
@@ -3218,17 +3220,19 @@ dnl ---------------------------------------------------------------------------
 dnl DirectShow MSW
 dnl ---------------------------------------------------------------------------
         wxUSE_DIRECTSHOW="yes"
-        AC_CHECK_HEADERS([dshow.h], [], [
-            wxUSE_DIRECTSHOW="no"
-            AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
-          ] )
+        AC_CHECK_HEADERS([dshow.h], [],
+            [
+                wxUSE_DIRECTSHOW="no"
+                AC_MSG_WARN([DirectShow not installed; consider installing the DirectX7 SDK or higher])
+            ],
+            [#include <windows.h>])
 
        if test "$wxUSE_DIRECTSHOW" = "yes"; then
-          AC_DEFINE(wxUSE_DIRECTSHOW)
-           LIBS="$LIBS -lstrmiids"          
+            AC_DEFINE(wxUSE_DIRECTSHOW)
+            LIBS="$LIBS -lstrmiids"
        fi
     fi
-    
+
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
     AC_DEFINE(wxUSE_MEDIACTRL)
 fi