WTF ?

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 96d99ba7e4237d1fc3ce947f3a42abf2eaa8cf5e..c3e0324dff2220623756628ab0e316738e92413f 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,7 +849,7 @@ 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])
@@ -857,7 +861,7 @@ then
           VLC_ADD_CFLAGS([screensaver],[$DBUS_CFLAGS])],
          [AC_MSG_WARN(DBUS library not found)])
       ]
-    )
+   )]
   )
 fi
 
@@ -902,9 +906,14 @@ AC_CACHE_CHECK([if $CC accepts -Wall],
      AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
 
 AC_CACHE_CHECK([if $CC accepts -Wextra],
-    [ac_cv_c_Werror],
+    [ac_cv_c_Wextra],
+    [CFLAGS="-Werror ${CFLAGS_save}"
+     AC_TRY_COMPILE([],,ac_cv_c_Wextra=yes, ac_cv_c_Wextra=no)])
+
+AC_CACHE_CHECK([if $CC accepts -Wno-unused-parameter],
+    [ac_cv_c_Wno_unused_parameter],
     [CFLAGS="-Werror ${CFLAGS_save}"
-     AC_TRY_COMPILE([],,ac_cv_c_Werror=yes, ac_cv_c_Werror=no)])
+     AC_TRY_COMPILE([],,ac_cv_c_Wno_unused_parameter=yes, ac_cv_c_Wno_unused_parameter=no)])
 
 AC_CACHE_CHECK([if $CC accepts -Wconversion],
     [ac_cv_c_Wconversion],
@@ -924,7 +933,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
@@ -933,6 +941,12 @@ if test "${ac_cv_c_Wextra}" != "no"; then
     OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
+if test "${ac_cv_c_Wno_unused_parameter}" != "no"; then
+    CFLAGS_save="${CFLAGS_save} -Wno-unused-parameter"; CFLAGS="${CFLAGS_save}"
+    CXXFLAGS_save="${CFLAGS_save} -Wno-unused-parameter"; CXXFLAGS="${CXXFLAGS_save}"
+    OBJCFLAGS_save="${OBJCFLAGS_save} -Wno-unused-parameter "; OBJCFLAGS="${OBJCFLAGS_save}"
+fi
+
 if test "${ac_cv_c_Wsign_compare}" != "no"; then
     CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
@@ -1545,8 +1559,29 @@ 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 Musicbrainz plugin
+dnl
 
+AC_ARG_ENABLE(musicbrainz,
+  [  --enable-musicbrainz    MusicBrainz support (default disabled) ])
+  AS_IF([test "${enable_musicbrainz}" = "yes"],[
+      PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
+       [ VLC_ADD_PLUGINS([musicbrainz])
+         VLC_ADD_LDFLAGS([musicbrainz],[$MUSICBRAINZ_LIBS]) 
+         VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS])  ],
+       [AC_MSG_WARN(MusicBrainz library not found)])
+   ])
 
 dnl
 dnl  Input plugins
@@ -1561,13 +1596,13 @@ then
   AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
 fi
 
-if test "${enable_livedotcom}" = "yes"
+if test "${enable_livedotcom}" = "no"
 then
-  enable_live555="yes"
+  enable_live555="no"
 fi
 AC_ARG_ENABLE(live555,
-[  --enable-live555        live555 RTSP input plugin (default disabled)])
-if test "${enable_live555}" = "yes"; then
+[  --enable-live555        live555 RTSP input plugin (default enabled)])
+if test "${enable_live555}" != "no"; then
   AC_ARG_WITH(live555-tree,
     [    --with-live555-tree=PATH live.com tree for static linking])
 
@@ -1640,8 +1675,10 @@ if test "${enable_live555}" = "yes"; then
       fi
     else
       dnl  The given live555 wasn't built
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
+        AC_MSG_RESULT(no)
+      if test "${enable_live555}" = "yes"; then
+        AC_MSG_ERROR([cannot find ${real_live555_tree}/liveMedia/libliveMedia.a, make sure you compiled live555 in ${with_live555_tree}])
+      fi       
     fi
   fi
 fi
@@ -5189,11 +5226,7 @@ then
        WINE_SDK_PATH=${with_wine_sdk_path}
        AC_PATH_PROG(WIDL, widl, no, [$WINE_SDK_PATH/bin:$WINE_SDK_PATH/tools/widl])
     else
-       AC_CHECK_PROGS(WIDL, [widl], no)
-       if test "${WIDL}" != "no"
-       then
-          WINE_SDK_PATH="`dirname ${WIDL}`"/..
-       fi
+       WIDL=no
     fi
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADERS(ole2.h olectl.h,
@@ -5633,6 +5666,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