*dvd and dvdread support for input III.

[vlc] / configure.in

diff --git a/configure.in b/configure.in
index f82a66b778953f73a8ae26319368e91291cd54b8..a2e3afd02978795d4be07611541c7ed70d2b8e72 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -72,7 +72,7 @@ case x"${target_os}" in
     ;;
   xbeos)
     SYS=beos
-    LIB="${LIB} -lbe"
+    LIB="${LIB} -lbe -lbind"
     LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
     PLDFLAGS="${PLDFLAGS} -nostart"
     ;;
@@ -212,7 +212,6 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[
 dnl Check for headers
 AC_CHECK_HEADERS(getopt.h strings.h)
 AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/time.h sys/times.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 sys/shm.h)
@@ -444,8 +443,8 @@ esac
 dnl
 dnl  default modules
 dnl
-BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
-PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort"
+BUILTINS="${BUILTINS} mpeg_es mpeg_ps mpeg_ts file udp http ipv4 memcpy idct idctclassic motion imdct downmix chroma_i420_rgb chroma_i420_yuy2 chroma_i422_yuy2 chroma_i420_ymga mpeg_adec ac3_adec mpeg_vdec"
+PLUGINS="${PLUGINS} lpcm_adec ac3_spdif spudec filter_deinterlace filter_invert filter_wall filter_transform filter_distort fx_scope"
 
 dnl
 dnl  Accelerated modules
@@ -759,6 +758,20 @@ AC_ARG_ENABLE(pth,
     fi])
 ])
 
+dnl
+dnl  State Threads
+dnl
+AC_ARG_ENABLE(st,
+  [  --enable-st             Enable State Threads (default disabled)],
+  [ if test x$enableval = xyes; then
+    AC_CHECK_LIB(st,st_init)
+    AC_EGREP_HEADER(st_init,st.h,[
+      AC_DEFINE(ST_INIT_IN_ST_H, 1,
+                Define if <st.h> defines st_init)
+    THREAD_LIB="-lst"
+    fi])
+])
+
 LIB="${LIB} ${THREAD_LIB}"
 
 dnl
@@ -855,11 +868,11 @@ AC_ARG_WITH(dvdread,
     x)
       if test x${STATIC_LIBDVDREAD} = x1
       then
-        BUILTINS="${BUILTINS} dvdread" 
+        #BUILTINS="${BUILTINS} dvdread" 
         CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD} -I../../extras/libdvdread"
         LIB_DVDREAD="${LIB_DVDREAD} lib/libdvdread.a ${LIB_DVD}"
       else
-        PLUGINS="${PLUGINS} dvdread"
+        #PLUGINS="${PLUGINS} dvdread"
         CFLAGS_DVDREAD="${CFLAGS_DVDREAD} -I../../extras/libdvdread  ${CFLAGS_DVD}"
         LIB_DVDREAD="${LIB_DVDREAD} -Llib -ldvdread ${LIB_DVD}"
       fi 
@@ -877,7 +890,7 @@ AC_ARG_WITH(dvdread,
       then
         AC_MSG_ERROR([Can't link shared dvdread with static dvdcss])
       else
-        PLUGINS="${PLUGINS} dvdread"
+        #PLUGINS="${PLUGINS} dvdread"
         CFLAGS_DVDREAD="${CFLAGS_DVDREAD} ${CFLAGS_DVD}"
         LIB_DVDREAD="${LIB_DVDREAD} -ldvdread ${LIB_DVD}"
       fi
@@ -898,18 +911,19 @@ AC_ARG_ENABLE(vcd,
 if test x$enable_vcd != xno
 then
   AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
-    BUILTINS="${BUILTINS} vcd"
+    #BUILTINS="${BUILTINS} vcd"
   ])
 fi
 
 if test x$enable_vcd != xno -a "${SYS}" = "bsdi"
 then
-  BUILTINS="${BUILTINS} vcd"
+  #BUILTINS="${BUILTINS} vcd"
+true #delete me
 fi
 
 if test x$enable_vcd != xno -a "${SYS}" = "darwin"
 then
-  BUILTINS="${BUILTINS} vcd"
+  #BUILTINS="${BUILTINS} vcd"
   LIB_VCD="${LIB_VCD} -framework IOKit" 
 fi
 
@@ -1004,8 +1018,9 @@ AC_ARG_ENABLE(dsp,
 if test x$enable_dsp != xno &&
   (test x$SYS != xmingw32 || test x$enable_dsp = xyes)
 then
-  AC_CHECK_HEADERS(sys/soundcard.h machine/soundcard.h, [
+  AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [
     PLUGINS="${PLUGINS} dsp"
+    AC_CHECK_LIB(ossaudio,main,LIB_DSP="${LIB_DSP} -lossaudio")
   ])
 fi
 
@@ -1530,6 +1545,7 @@ AC_SUBST(LIB_ARTS)
 AC_SUBST(LIB_BEOS)
 AC_SUBST(LIB_DARWIN)
 AC_SUBST(LIB_DIRECTX)
+AC_SUBST(LIB_DSP)
 AC_SUBST(LIB_DVD)
 AC_SUBST(LIB_DVDREAD)
 AC_SUBST(LIB_ESD)