X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=fb20c9027e10caa23ffabacae5f2edd3a205dd9c;hb=d016a4283ea29e3596172e4c761f6d66c0d44268;hp=276a0b3dee8d57e7ccd93e31724572008a34d612;hpb=2242665b9b86102477ac0e2299a73bd6b1f6e342;p=vlc

diff --git a/configure.ac b/configure.ac
index 276a0b3dee..fb20c9027e 100644
--- 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)
@@ -37,33 +37,18 @@ VLC_SAVE_FLAGS
 dnl
 dnl Check for tools
 dnl
+AC_PROG_CC_C99
+AC_USE_SYSTEM_EXTENSIONS
 AM_PROG_CC_C_O
-AC_PROG_CPP
 AC_PROG_CXX
-eval "${CXX} --version" >/dev/null 2>&1 || CXX=""
-if test "${CXX}" != ""; then
-  AC_PROG_CXXCPP
-fi
+AC_PROG_CPP
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+AC_PROG_EGREP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AM_PROG_AS
 
-dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
-dnl now otherwise it might be set in an obscure if statement.
-AC_EGREP_CPP(foo,foo)
-
-dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround
-AC_MSG_CHECKING(for an Objective-C compiler)
-OBJC="${CXX}"
-AC_SUBST(OBJC)
-OBJCFLAGS="${CXXFLAGS} -fgnu-runtime -fconstant-string-class=NSConstantString"
-AC_SUBST(OBJCFLAGS)
-dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here
-#OBJCDEPMODE="depmode=gcc3"
-#AC_SUBST(OBJCDEPMODE)
-_AM_DEPENDENCIES(OBJC)
-AC_MSG_RESULT(not implemented yet)
-
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
@@ -130,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
@@ -854,18 +842,26 @@ AC_ARG_ENABLE(dbus,
  
 if test "${enable_dbus}" != "no"
 then
-  PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.30,
-    [ AC_DEFINE( HAVE_DBUS_1, 1, [Define if you have the new D-BUS library API])
+  PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.92,
+    [ AC_DEFINE( HAVE_DBUS_2, 1, [Define if you have the D-BUS library API >= 0.92] )
+      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 older dbus
-    [ PKG_CHECK_MODULES( DBUS, dbus-1, 
-       [AC_DEFINE(HAVE_DBUS, 1, [Define if you have the D-BUS library])
+    [ 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])],
-       [AC_MSG_WARN(DBUS library not found)])
-    ]
+      dnl much older dbus
+      [ PKG_CHECK_MODULES( DBUS, dbus-1, 
+         [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])],
+         [AC_MSG_WARN(DBUS library not found)])
+      ]
+   )]
   )
 fi
 
@@ -904,22 +900,27 @@ fi
 #    fi
 #done
 
-AC_CACHE_CHECK([if \$CC accepts -Wall],
+AC_CACHE_CHECK([if $CC accepts -Wall],
     [ac_cv_c_Wall],
     [CFLAGS="-Wall ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wconversion],
+AC_CACHE_CHECK([if $CC accepts -Wextra],
+    [ac_cv_c_Werror],
+    [CFLAGS="-Werror ${CFLAGS_save}"
+     AC_TRY_COMPILE([],,ac_cv_c_Werror=yes, ac_cv_c_Werror=no)])
+
+AC_CACHE_CHECK([if $CC accepts -Wconversion],
     [ac_cv_c_Wconversion],
     [CFLAGS="-Wconversion ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wunreachable-code],
+AC_CACHE_CHECK([if $CC accepts -Wunreachable-code],
     [ac_cv_c_Wunreachable_code],
     [CFLAGS="-Wunreachable-code ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
+AC_CACHE_CHECK([if $CC accepts -Wsign-compare],
     [ac_cv_c_Wsign_compare],
     [CFLAGS="-Wsign-compare ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
@@ -927,7 +928,12 @@ 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
+    CFLAGS_save="-Wextra ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
+    CXXFLAGS_save="-Wextra ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+    OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
 if test "${ac_cv_c_Wsign_compare}" != "no"; then
@@ -1542,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
@@ -5512,7 +5525,7 @@ dnl AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${VLC_SYMBOL}", [String suffix for modu
 dnl AC_DEFINE_UNQUOTED(MODULE_SYMBOL, ${VLC_SYMBOL}, [Symbol suffix for module functions])
 
 dnl New definitions with value matching 0.8.6 release
-module_symbol="0_8_6b"
+module_symbol="0_8_6c"
 AC_DEFINE_UNQUOTED(MODULE_SUFFIX, "__${module_symbol}", [String suffix for module functions])
 AC_DEFINE_UNQUOTED(MODULE_SYMBOL, $module_symbol, [Symbol suffix for module functions])
 VLC_ENTRY="vlc_entry__${module_symbol}"
@@ -5630,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