Configure: remove HAVE_DIRECTX

Salmista-94 · May 16, 2016 · ab5b088 · ab5b088
1 parent 6caacec
commit ab5b088
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -3317,13 +3317,10 @@ AC_ARG_ENABLE(directx,
     enable_directx="no"
   ])
 ])
-have_directx="no"
 AS_IF([test "${enable_directx}" != "no"], [
   dnl DirectDraw
   AC_CHECK_HEADERS(ddraw.h, [
-    have_directx="yes"
-  ], [
-    AC_MSG_ERROR([Cannot find DirectX headers!])
+    VLC_ADD_PLUGIN([directdraw])
   ])
 
   dnl OpenGL
@@ -3349,7 +3346,6 @@ AS_IF([test "${enable_directx}" != "no"], [
     VLC_ADD_PLUGIN([direct2d])
   ])
 ])
-AM_CONDITIONAL([HAVE_DIRECTX], [test "$have_directx" = "yes"])
 
 dnl
 dnl  Linux framebuffer module

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
@@ -209,7 +209,8 @@ libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_directdraw
 libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libdirectdraw_plugin.la
+vout_LTLIBRARIES += $(LTLIBdirectdraw)
+EXTRA_LTLIBRARIES += libdirectdraw_plugin.la
 endif
 
 libglwin32_plugin_la_SOURCES = video_output/win32/glwin32.c \