Lua: use the spin icon in Allocine

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index ade6419f6adc50630a4581e8a4978eccf88cd0e5..1541ba30d0a2d5472699224dd126b04775600997 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1686,7 +1686,7 @@ AS_IF([test "${enable_growl}" != "no"], [
 dnl
 dnl Libnotify notification plugin
 dnl
-PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
+PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-2.0], [libnotify notification], [auto])
 
 dnl
 dnl Taglibplugin
@@ -1839,10 +1839,27 @@ fi
 dnl
 dnl - special access module for dc1394 input
 dnl - dv module: digital video module check for libraw1394
+dnl - linsys modules: access module check for libzvbi
 dnl
 PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
 PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
 
+AC_ARG_ENABLE(linsys,
+  [  --enable-linsys         Linux Linear Systems Ltd. SDI and HD-SDI input cards (default enabled)])
+case "${SYS}" in
+    linux*)
+if test "${enable_linsys}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
+  VLC_ADD_PLUGIN([linsys_hdsdi])
+  PKG_CHECK_MODULES(LINSYS_SDI, zvbi-0.2 >= 0.2.28,
+    [ VLC_ADD_LIBS([linsys_sdi],[$LINSYS_SDI_LIBS])
+      VLC_ADD_CFLAGS([linsys_sdi],[$LINSYS_SDI_CFLAGS])
+      VLC_ADD_PLUGIN([linsys_sdi]) ],
+    [AC_MSG_WARN([Couldn't find zvbi >= 0.2.28, install libzvbi-dev ?])]
+  )
+fi
+;;
+esac
+
 dnl
 dnl dvdread module: check for libdvdread
 dnl
@@ -2462,12 +2479,16 @@ if test "${enable_crystalhd}" == "yes"; then
       VLC_ADD_PLUGIN([crystalhd])
       VLC_ADD_LIBS([crystalhd], [-lcrystalhd])
     ],[
-        AC_CHECK_HEADERS(libcrystalhd/bc_drv_if.h, [
+      if test "${SYS}" = "mingw32" ; then
+        AC_CHECK_HEADERS(libcrystalhd/bc_dts_defs.h, [
           VLC_ADD_PLUGIN([crystalhd])
-          VLC_ADD_LIBS([crystalhd], [-lbcmDIL])
+          AC_CHECK_HEADERS(libcrystalhd/bc_drv_if.h, [
+            VLC_ADD_LIBS([crystalhd], [-lbcmDIL])
+            ])
         ],[
           AC_MSG_ERROR("Could not find CrystalHD development headers")
         ])
+      fi
     ])
 fi
 
@@ -4204,8 +4225,8 @@ AM_CONDITIONAL([HAVE_SQLITE], [test "${enable_sqlite}" != "no"])
 dnl
 dnl media library
 dnl
-AC_ARG_ENABLE(media-library, [--enable-media-library media library (default auto)])
-if test "${enable_media_library}" != "no"; then
+AC_ARG_ENABLE(media-library, [--enable-media-library media library (default disabled)])
+if test "${enable_media_library}" == "yes"; then
     if test "${enable_sqlite}" != "yes"; then
         if test "${enable_media_library}" == "yes"; then
             AC_MSG_ERROR([SQLite module is required for the media library])
@@ -4218,6 +4239,7 @@ if test "${enable_media_library}" != "no"; then
        VLC_ADD_PLUGIN([media_library])
     fi
 fi
+AM_CONDITIONAL([ENABLE_MEDIA_LIBRARY], [test "${enable_media_library}" = "yes"])
 
 dnl
 dnl  Endianness check
@@ -4452,7 +4474,6 @@ AC_CONFIG_FILES([
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile
   modules/misc/stats/Makefile
-  modules/misc/xml/Makefile
   modules/media_library/Makefile
   modules/mux/Makefile
   modules/mux/mpeg/Makefile