Add myself.

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index b997a5fcb3e2b164b592467c491b3541013c2b2a..fd9b7d83c80c5b18d6d333e5f8b498787aad704f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1217,7 +1217,7 @@ dnl  default modules
 dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
-VLC_ADD_PLUGINS([cvdsub svcdsub spudec telx subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
+VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
 VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen])
 VLC_ADD_PLUGINS([converter_fixed mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
@@ -3783,19 +3783,36 @@ if test "${enable_x264}" != "no"; then
 fi
 
 dnl
+dnl Teletext Modules
 dnl vbi decoder plugin (using libzbvi)
+dnl telx module
+dnl uncompatible
 dnl
 AC_ARG_ENABLE(zvbi,
-  [  --enable-zvbi          VBI decoding support with libzvbi (default enabled)])
-if test "${enable_zvbi}" != "no"; then
-  PKG_CHECK_MODULES(ZVBI,
-        zvbi-0.2 >= 0.2.25,
-        [
-          VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
-          VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
-          VLC_ADD_PLUGINS([zvbi]) ],
-        [AC_MSG_WARN(ZVBI library not found)])
-fi
+  [  --enable-zvbi           VBI (inc. Teletext) decoding support with libzvbi (default enabled)])
+AC_ARG_ENABLE(telx,
+  [  --enable-telx,          Teletext decoding module (conflicting with zvbi) (default disabled)])
+
+AS_IF( [test "${enable_zvbi}" != "no"],[
+  AS_IF( [test "${enable_telx}" = "yes"],[
+    AC_MSG_ERROR([The zvbi and telx modules are uncompatibles. Disable the other if you enable one.])
+  ],[
+    PKG_CHECK_MODULES(ZVBI,
+       zvbi-0.2 >= 0.2.25,
+       [
+         VLC_ADD_LDFLAGS([zvbi],[$ZVBI_LIBS])
+         VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS])
+         VLC_ADD_PLUGINS([zvbi])
+         AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) 
+       ],[
+         AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead)
+         enable_telx="yes"
+       ])
+    ])  
+  ])
+AS_IF( [test "${enable_telx}" = "yes"],[
+  VLC_ADD_PLUGINS([telx])
+  ])
 
 dnl
 dnl  CMML plugin