* removed an outdated method instead of commenting it

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8d38a7b403b008333ab348059a22275c07048073..fb20c9027e10caa23ffabacae5f2edd3a205dd9c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.8.6-svn)
+AC_INIT(vlc,0.9.0-svn)
 VERSION_MAJOR="0"
-VERSION_MINOR="8"
-VERSION_REVISION="6"
+VERSION_MINOR="9"
+VERSION_REVISION="0"
 VERSION_EXTRA="svn"
 
 CONFIGURE_LINE="$0 $*"
-CODENAME="Janus"
+CODENAME="Grishenko"
 
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR(src/libvlc.c)
@@ -41,6 +41,7 @@ AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
 AM_PROG_CC_C_O
 AC_PROG_CXX
+AC_PROG_CPP
 AC_PROG_OBJC
 _AM_DEPENDENCIES([OBJC])
 AC_PROG_EGREP
@@ -114,6 +115,9 @@ dnl kludge because only the debian package provides a ffmpeg-config
     if test -z $with_cyberlink_tree; then
        with_cyberlink_tree=${topdir}/extras/contrib/src/clinkcc
     fi
+    if test -z $with_libmpeg2_tree; then
+       with_libmpeg2_tree=${topdir}/extras/contrib/src/mpeg2dec
+    fi
 
     if test ".`uname -s`" = ".Darwin"; then
       export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
@@ -845,11 +849,11 @@ then
       VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
       VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
     dnl older dbus
-    PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
+    [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
       [ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the D-BUS library API >= 0.30 ] )
         AC_DEFINE( HAVE_DBUS, 1, [Define if you have the D-BUS library] )
         VLC_ADD_LDFLAGS([screensaver],[$DBUS_LIBS])
-        VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],   
+        VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
       dnl much older dbus
       [ PKG_CHECK_MODULES( DBUS, dbus-1, 
          [AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library])
@@ -857,7 +861,7 @@ then
           VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
          [AC_MSG_WARN(DBUS library not found)])
       ]
-    )
+   )]
   )
 fi
 
@@ -924,7 +928,6 @@ AC_CACHE_CHECK([if $CC accepts -Wsign-compare],
 if test "${ac_cv_c_Wall}" != "no"; then
     CFLAGS_save="-Wall ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
-    OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
 if test "${ac_cv_c_Wextra}" != "no"; then
@@ -1545,8 +1548,15 @@ AS_IF([test "${enable_notify}" != "no"], [
       ])
   ])
 
+dnl
+dnl Audioscrobbler plugin
+dnl
 
-
+AC_ARG_ENABLE(audioscrobbler,
+  [  --enable-audioscrobbler Last.fm submission plugin (default enabled)])
+AS_IF([test "${enable_audioscrobbler}" != "no"], [
+        VLC_ADD_PLUGINS([audioscrobbler])
+  ])
 
 dnl
 dnl  Input plugins
@@ -5633,6 +5643,7 @@ AC_CONFIG_FILES([
   modules/misc/dummy/Makefile
   modules/misc/memcpy/Makefile
   modules/misc/network/Makefile
+  modules/misc/notify/Makefile
   modules/misc/testsuite/Makefile
   modules/misc/playlist/Makefile
   modules/misc/xml/Makefile