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)
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_Werror=yes, ac_cv_c_Werror=no)])
+ 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_Wno_unused_parameter=yes, ac_cv_c_Wno_unused_parameter=no)])
AC_CACHE_CHECK([if $CC accepts -Wconversion],
[ac_cv_c_Wconversion],
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
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}"
if test "${SYS}" != "mingwce"; then
dnl VLC_ADD_PLUGINS([externrun])
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
- VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake])
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf marq podcast shout sap fake folder])
VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
])
])
+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 Taglibplugin
+dnl
+AC_ARG_ENABLE(taglib,
+ [ --enable-taglib Taglib support (default disabled) ])
+ AS_IF([test "${enable_taglib}" = "yes"],[
+ PKG_CHECK_MODULES(TAGLIB, taglib,
+ [ VLC_ADD_PLUGINS([taglib])
+ VLC_ADD_LDFLAGS([taglib],[$TAGLIB_LIBS])
+ VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
+ [AC_MSG_WARN(TagLib library not found)])
+ ])
dnl
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])
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
AC_PATH_PROG(WX_CONFIG, ${WXWIDGETS_NAME}, no, ${WXWIDGETS_PATH})
if test "${WX_CONFIG}" != "no" -a "${CXX}" != ""
then
- if expr 2.3.0 \> `${WX_CONFIG} --version` >/dev/null
+ if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null || expr 2.7.0 \<= `${WX_CONFIG} --version` >/dev/null
then
- AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
+ AC_MSG_ERROR([You need wxWidgets of the 2.6 branch. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
fi
AC_LANG_PUSH(C++)
# Turn this error:
fi
-dnl
-dnl corba (ORBit) plugin
-dnl
-dnl Default: do not enable corba
-enablecorba=false
-AC_ARG_ENABLE(corba,
- [ --enable-corba corba interface support (default disabled)])
-if test "${enable_corba}" = "yes"; then
- GLIB_VERSION=2.3.2
- PKG_CHECK_MODULES(CORBA,
- ORBit-2.0 >= 2.8.0 \
- glib-2.0 >= $GLIB_VERSION \
- gobject-2.0 >= $GLIB_VERSION \
- gthread-2.0 >= $GLIB_VERSION,
- [
- enablecorba=true
- VLC_ADD_LDFLAGS([corba],[$CORBA_LIBS])
- VLC_ADD_CFLAGS([corba],[$CORBA_CFLAGS])
- VLC_ADD_PLUGINS([corba snapshot]) ],
- [ enablecorba=false
- AC_MSG_WARN(corba library not found) ])
-fi
-AM_CONDITIONAL(ENABLE_CORBA, test "$enablecorba" = "true")
-
AC_ARG_WITH(,[Misc options:])
dnl
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,
dnl
dnl Mediacontrol Python bindings
dnl
-AC_ARG_ENABLE(mediacontrol-python-bindings,
- [ --enable-mediacontrol-python-bindings Enable Python bindings for MediaControl (default disabled)])
+AC_ARG_ENABLE(python-bindings,
+ [ --enable-python-bindings Enable Python bindings (default disabled)])
dnl TODO: look for python dev headers
-AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_mediacontrol_python_bindings}" = "yes"])
+AM_CONDITIONAL(BUILD_PYTHON, [test "${enable_python_bindings}" = "yes"])
dnl
dnl Java bindings
bindings/Makefile
bindings/java/Makefile
bindings/java/src/Makefile
- bindings/mediacontrol-python/Makefile
+ bindings/python/Makefile
doc/Makefile
intl/Makefile
ipkg/Makefile
modules/codec/spudec/Makefile
modules/control/Makefile
modules/control/http/Makefile
- modules/control/corba/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
modules/demux/avi/Makefile
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
modules/demux/playlist/Makefile
- modules/demux/util/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
modules/gui/pda/Makefile
modules/gui/skins2/Makefile
modules/gui/wxwidgets/Makefile
modules/gui/wince/Makefile
+ modules/meta_engine/Makefile
modules/misc/Makefile
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
projects / vlc / blobdiff