X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.in;h=af464d68e06cb75db0dfae1852650923083e810d;hb=945f294626b776bbabadc5627c05456a6ff0ae2b;hp=5b3def39951fc87647eee255cd1afc2b0bc0be02;hpb=e9cc5c05f7423734b0a8a4c8e105e8bb65e50dcd;p=vlc

diff --git a/configure.in b/configure.in
index 5b3def3995..af464d68e0 100644
--- a/configure.in
+++ b/configure.in
@@ -68,13 +68,13 @@ CFLAGS="${CFLAGS} -I/usr/local/include"
 dnl Check for pthreads - borrowed from XMMS
 PTHREAD_LIBS=error
 AC_CHECK_LIB(pthread,pthread_attr_init,PTHREAD_LIBS="-lpthread")
-if test "x$PTHREAD_LIBS" = xerror; then
+if test "x${PTHREAD_LIBS}" = xerror; then
   AC_CHECK_LIB(pthreads,pthread_attr_init,PTHREAD_LIBS="-lpthreads")
 fi
-if test "x$PTHREAD_LIBS" = xerror; then
+if test "x${PTHREAD_LIBS}" = xerror; then
   AC_CHECK_LIB(c_r,pthread_attr_init,PTHREAD_LIBS="-lc_r")
 fi
-if test "x$PTHREAD_LIBS" = xerror; then
+if test "x${PTHREAD_LIBS}" = xerror; then
   PTHREAD_LIBS=""
   AC_CHECK_FUNC(pthread_attr_init)
 fi
@@ -395,6 +395,30 @@ AC_ARG_WITH(sdl,
        LIB_SDL="${LIB_SDL} -L/usr/X11R6/lib -lSDL"])
     fi
 
+dnl
+dnl  Windows DirectX module
+dnl
+AC_ARG_WITH(directx,
+  [  --with-directx[=name]   Windows DirectX support (default enabled)],
+  [ if test "x$withval" != "xno";
+    then
+      PLUGINS="${PLUGINS} directx";
+      if test "x$withval" != "xyes";
+      then
+        LIB_DIRECTX="${LIB_DIRECTX} -L"$withval"/lib -lddraw -ldsound"
+        INCLUDE="${INCLUDE} -I"$withval"/include"
+      else
+        AC_CHECK_HEADERS(directx.h, , [echo "Cannot find DirectX headers !"; exit])
+        LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"
+      fi
+    fi ])
+    if test "x$withval" = "x";
+    then
+      AC_CHECK_HEADERS(directx.h,
+      [PLUGINS="${PLUGINS} directx"
+       LIB_DIRECTX="${LIB_DIRECTX} -L/usr/lib -lddraw -ldsound"])
+    fi
+
 dnl
 dnl  Glide module
 dnl
@@ -562,6 +586,7 @@ AC_SUBST(LIB_NCURSES)
 AC_SUBST(LIB_QT)
 AC_SUBST(LIB_TS)
 AC_SUBST(LIB_SDL)
+AC_SUBST(LIB_DIRECTX)
 AC_SUBST(LIB_X11)
 AC_SUBST(LIB_XVIDEO)
 AC_SUBST(LIB_YUV)