Contribs: use our copy for gsm tarball

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index c391161b51e8f7ac6323846f447314bf9007f197..1a4bd5e56e117c5ec23c2bf88e888020ad14ef87 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Autoconf settings for vlc
 
-AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
 
 AC_INIT(vlc, 1.1.0-git)
 VERSION_MAJOR="1"
@@ -12,7 +12,7 @@ AC_SUBST(PKGDIR)
 
 CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
 CODENAME="The Luggage"
-COPYRIGHT_YEARS="1996-2009"
+COPYRIGHT_YEARS="1996-2010"
 
 AC_PREREQ(2.59c)
 AC_CONFIG_SRCDIR(src/libvlc.c)
@@ -2531,6 +2531,9 @@ AC_ARG_ENABLE(cdda,
 AC_ARG_ENABLE(vcd,
   [  --enable-vcd            built-in VCD (default enabled)])
 
+AC_ARG_ENABLE(libcddb,
+  [  --enable-libcddb        CDDB support for libcdio audio CD (default enabled)])
+
 if test "${enable_vcd}" != "no"
 then
   AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
@@ -3500,16 +3503,6 @@ AS_IF( [test "${enable_asademux}" = "yes"], [
       ])
   ])
 
-dnl
-dnl  CMML plugin
-dnl
-AC_ARG_ENABLE(cmml,
-  [  --enable-cmml           CMML support (default enabled)])
-if test "${enable_cmml}" != "no"
-then
-  VLC_ADD_PLUGIN([cmml])
-fi
-
 dnl
 dnl  kate decoder plugin
 dnl
@@ -5132,7 +5125,6 @@ AC_CONFIG_FILES([
   modules/audio_output/Makefile
   modules/codec/Makefile
   modules/codec/avcodec/Makefile
-  modules/codec/cmml/Makefile
   modules/codec/dmo/Makefile
   modules/codec/shine/Makefile
   modules/codec/subtitles/Makefile