* DirectX plugin by Gildas Bazin <gbazin@netcourrier.com>.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index 6b85cc1816b9a67601853c89cc83793ce5bb5b48..af464d68e06cb75db0dfae1852650923083e810d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -61,29 +61,24 @@ AC_FUNC_MMAP
 AC_TYPE_SIGNAL
 AC_CHECK_LIB(dl,dlopen,LIB="${LIB} -ldl")
 AC_CHECK_LIB(m,pow,LIB_YUV="${LIB_YUV} -lm")
-AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
-AC_EGREP_CPP(yes,
-       [#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001
-         yes
-       #endif
-       ], AC_MSG_RESULT(yes)
-       DEFINE="${DEFINE} -D_THREAD_SAFE" LIB="${LIB} -pthread",
-       AC_MSG_RESULT(no)
-       AC_CHECK_LIB(pthread,pthread_create,LIB="${LIB} -lpthread"))
-AC_CHECK_LIB(threads,thread_create,LIB="${LIB} -lthreads")
 
 CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+CFLAGS="${CFLAGS} -I/usr/local/include"
 
-dnl Check for headers
-AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
-AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h unistd.h)
-AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
-AC_CHECK_HEADERS(dlfcn.h image.h)
-AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
-AC_CHECK_HEADERS(machine/param.h)
-
-dnl Check for threads library
-AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
+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
+  AC_CHECK_LIB(pthreads,pthread_attr_init,PTHREAD_LIBS="-lpthreads")
+fi
+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
+  PTHREAD_LIBS=""
+  AC_CHECK_FUNC(pthread_attr_init)
+fi
+LIB="${LIB} ${PTHREAD_LIBS}"
 
 dnl Check for misc headers
 AC_EGREP_HEADER(pthread_cond_t,pthread.h,[
@@ -95,6 +90,17 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
             Define if <strings.h> defines strncasecmp.)
 ])
 
+dnl Check for headers
+AC_CHECK_HEADERS(stddef.h getopt.h strings.h)
+AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h unistd.h)
+AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h)
+AC_CHECK_HEADERS(dlfcn.h image.h)
+AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
+AC_CHECK_HEADERS(machine/param.h)
+
+dnl Check for threads library
+AC_CHECK_HEADERS(cthreads.h pthread.h kernel/scheduler.h kernel/OS.h)
+
 dnl Check for ntohl, etc.
 CFLAGS="${CFLAGS} -Wall -Werror"
 AC_MSG_CHECKING([for ntohl in sys/param.h])
@@ -103,13 +109,6 @@ void foo() { int meuh; ntohl(meuh); }],,
  AC_DEFINE(NTOHL_IN_SYS_PARAM_H, 1, Define if <sys/param.h> defines ntohl.)
  AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
-dnl Check for -rdynamic flag
-CFLAGS="${CFLAGS} -rdynamic -Wall -Werror"
-AC_MSG_CHECKING([if \$CC miserably fails with the -rdynamic flag])
-AC_TRY_COMPILE([],,
- LCFLAGS="${LCFLAGS} -rdynamic"
- AC_MSG_RESULT(no), AC_MSG_RESULT(yes))
-
 dnl End of the bizarre compilation tests
 CFLAGS="${save_CFLAGS}"
 
@@ -143,9 +142,11 @@ dnl
 case x$host_os in
   xmingw32msvc)
     MMX_PLUGINS="idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn"
     ;;
   *)
     MMX_PLUGINS="yuvmmx idctmmx motionmmx"
+    MMXEXT_PLUGINS="idctmmxext motionmmxext imdct3dn imdctsse downmix3dn downmixsse"
     ;;
 esac
 
@@ -156,7 +157,7 @@ AC_TRY_COMPILE([void quux(){void *p;asm("packuswb %%mm1,%%mm2"::"r"(p));}],,
 
 AC_MSG_CHECKING([if \$CC groks MMX EXT or SSE inline assembly])
 AC_TRY_COMPILE([void quux(){void *p;asm("maskmovq %%mm1,%%mm2"::"r"(p));}],,
-  ACCEL_PLUGINS="${ACCEL_PLUGINS} idctmmxext motionmmxext imdctsse downmix3dn downmixsse"
+  ACCEL_PLUGINS="${ACCEL_PLUGINS} ${MMXEXT_PLUGINS}"
   AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
 
 dnl
@@ -394,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
@@ -404,9 +429,9 @@ AC_ARG_WITH(glide,
       PLUGINS="${PLUGINS} glide";
       if test "x$withval" != "xyes";
       then
-        LIB_GLIDE="-l"$withval
+        LIB_GLIDE="-l"$withval" -lm"
       else
-        LIB_GLIDE="-lglide2x"
+        LIB_GLIDE="-lglide2x -lm"
       fi
     fi ])
 
@@ -561,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)