* configure.ac.in, modules/codec/Modules.am, modules/codec/libmpeg2.c:

[vlc] / configure.ac.in

diff --git a/configure.ac.in b/configure.ac.in
index ab9cc12ca743875d8158fbcbd96a5893164560a5..b47f8183919085a977d18cf6a89d4ca98906fc6d 100644 (file)
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -130,7 +130,7 @@ case "x${target_os}" in
         LDFLAGS_access_ftp="${LDFLAGS_access_ftp} -lws2_32"
         LDFLAGS_access_output_udp="${LDFLAGS_access_output_udp} -lws2_32"
         LDFLAGS_sap="${LDFLAGS_sap} -lws2_32"
-        LDFALGS_httpd="${LDFLAGS_httpd} -lws2_32"
+        LDFLAGS_httpd="${LDFLAGS_httpd} -lws2_32"
     fi
     ;;
   x*nto*)
@@ -171,7 +171,7 @@ dnl
 dnl Gettext stuff
 dnl
 ALL_LINGUAS="de en_GB fr it ja no ru nl pl sv"
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT
 if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
   AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
@@ -955,6 +955,13 @@ then
   PLUGINS="${PLUGINS} packetizer_copy"
 
   PLUGINS="${PLUGINS} vout_encoder"
+
+    dnl Ogg/ogm
+    AC_CHECK_HEADERS(ogg/ogg.h, [
+      AC_CHECK_LIB( ogg, ogg_stream_packetin, [
+        PLUGINS="${PLUGINS} mux_ogg"
+        LDFLAGS_mux_ogg="${LDFLAGS_mux_ogg} -logg" ])
+    ],[])
 fi
 
 
@@ -1738,6 +1745,19 @@ dnl
 AC_ARG_ENABLE(dv,
   [  --enable-dv             DV decoder support (default disabled)])
 if test "x${enable_dv}" = "xyes"
+then
+  AC_CHECK_HEADERS(libdv/dv.h, [
+    PLUGINS="${PLUGINS} dv"
+    LDFLAGS_dv="${LDFLAGS_dv} -ldv"
+   ],[])
+fi
+
+dnl
+dnl  Flac plugin
+dnl
+AC_ARG_ENABLE(flac,
+  [  --enable-flac           flac decoder support (default disabled)])
+if test "x${enable_flac}" = "xyes"
 then
   AC_CHECK_HEADERS(FLAC/stream_decoder.h, [
     PLUGINS="${PLUGINS} flac flacdec"
@@ -1746,15 +1766,15 @@ then
 fi
 
 dnl
-dnl  DV plugin
+dnl  Libmpeg2 plugin
 dnl
-AC_ARG_ENABLE(flac,
-  [  --enable-falc         flac decoder support (default disabled)])
-if test "x${enable_flac}" = "xyes"
+AC_ARG_ENABLE(libmpeg2,
+  [  --enable-libmpeg2       libmpeg2 decoder support (default disabled)])
+if test "x${enable_libmpeg2}" = "xyes"
 then
-  AC_CHECK_HEADERS(libdv/dv.h, [
-    PLUGINS="${PLUGINS} dv"
-    LDFLAGS_dv="${LDFLAGS_dv} -ldv"
+  AC_CHECK_HEADERS(mpeg2dec/mpeg2.h, [
+    PLUGINS="${PLUGINS} libmpeg2"
+    LDFLAGS_libmpeg2="${LDFLAGS_libmpeg2} -lmpeg2"
    ],[])
 fi