CODENAME="Twoflower"
COPYRIGHT_YEARS="1996-2010"
-AC_PREREQ(2.59c)
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CONFIG_MACRO_DIR(m4)
AC_CANONICAL_HOST
AC_PRESERVE_HELP_ORDER
-AM_INIT_AUTOMAKE(tar-ustar)
+AM_INIT_AUTOMAKE(tar-ustar color-tests)
AM_CONFIG_HEADER(config.h)
# Disable with "./configure --disable-silent-rules" or "make V=1"
-m4_ifdef([AM_SILENT_RULES], [
- AM_SILENT_RULES([yes])
-], [
- AM_DEFAULT_VERBOSITY=1
- AC_SUBST(AM_DEFAULT_VERBOSITY)
-])
-
+AM_SILENT_RULES([yes])
dnl Too many people are not aware of maintainer mode:
dnl If you want to use it, you definitely know what you are doing, so
dnl
AC_ARG_ENABLE(peflags,
[ --enable-peflags peflags use (default enabled on Windows)])
- if test "${enable_peflags}" != "no"
- then
+ if test "${enable_peflags}" != "no" ; then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
+ ac_default_prefix="`pwd`/_win32"
+ DESTDIR="`pwd`/_win32/"
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_standard stream_out_rtp remoteosd ts audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
+ ac_default_prefix="`pwd`/_wince"
+ DESTDIR="`pwd`/_wince/"
fi
;;
*nto*)
dnl
dnl Gettext stuff
dnl
-AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT([external])
VLC_ADD_LIBS([libvlccore vlc], [${LTLIBINTL}])
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
+dnl Manual switch for UTF-8
+AC_ARG_ENABLE(non-utf8,
+ [ --enable-non-utf8 Legacy non-UTF-8 systems support (default disabled)], [
+ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+ enable_non_utf8="no"
+ ])
+])
+AS_IF([test "${enable_non_utf8}" != "no"], [
+ AC_DEFINE([ASSUME_UTF8], [1],
+ [Define to 1 if the operating system uses UTF-8 internally])
+])
+
+
dnl Check for dbus
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
fi
AC_ARG_VAR([LUAC], [LUA byte compiler])
AC_PATH_PROGS(LUAC,[${LUAC} luac], [false])
- AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
+ AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
])
fi
PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5,
[ VLC_ADD_PLUGIN([taglib])
VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
- VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ],
+ VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS])
+ AC_LANG_PUSH(C++)
+ AC_CHECK_HEADERS(taglib/mp4coverart.h)
+ AC_LANG_POP(C++)
+ ],
[AC_MSG_WARN(TagLib library not found)])
])
fi
CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
- AC_CHECK_HEADERS(linux/videodev2.h, [
+ AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h, [
VLC_ADD_PLUGIN([v4l2])
],[])
CPPFLAGS="${CPPFLAGS_save}"
dnl modplug demux plugin
dnl
AC_ARG_ENABLE(mod,
- [ --enable-mod Mod demux support (default enabled)])
-if test "${enable_mod}" != "no"
-then
- AC_ARG_WITH(mod-tree,
- [ --with-mod-tree=PATH mod tree for static linking])
- if test -n "${with_mod_tree}"
- then
- AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
- real_mod_tree="`cd ${with_mod_tree} 2>/dev/null && pwd`"
- if test -z "${real_mod_tree}"
- then
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_mod_tree}])
- fi
- if test -f "${real_mod_tree}/src/.libs/libmodplug.a"
- then
- dnl Use a custom mod
- AC_MSG_RESULT(${real_mod_tree}/src/.libs/libmodplug.a)
- VLC_ADD_PLUGIN([mod])
- VLC_ADD_LIBS([mod],[${real_mod_tree}/src/.libs/libmodplug.a -lstdc++])
- VLC_ADD_CXXFLAGS([mod],[-I${real_mod_tree}/include])
- else
- dnl The given mod wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
- fi
- else
- PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
- [ VLC_ADD_PLUGIN([mod])
+ [ --enable-mod Mod demux support (default auto)])
+if test "${enable_mod}" != "no" ; then
+ PKG_CHECK_MODULES(LIBMODPLUG, [libmodplug >= 0.8.4 libmodplug != 0.8.8], [
+ VLC_ADD_PLUGIN([mod])
VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
- ],[AC_MSG_WARN([libmodplug not found!])])
- fi
+ ],[
+ AS_IF([test x"${enable_mod}" = "xyes"],
+ [AC_MSG_ERROR(libmodplug not found or a broken version (0.8.8.0) was found!)],
+ [AC_MSG_WARN(libmodplug not found or a broken version (0.8.8.0) was found!)])
+ ])
fi
dnl
fi
fi
-dnl
-dnl libid3tag support (FIXME!!! doesn't work with new input)
-dnl
-AC_ARG_ENABLE( id3tag,
-[ --disable-id3tag id3tag metadata reader plugin (default disabled)])
-AS_IF([test "${enable_id3tag}" = "yes"], [
- AC_CHECK_HEADERS(id3tag.h, [
- AS_IF([test "${have_zlib}" = "yes"],[
- VLC_ADD_LIBS([id3tag],[-lid3tag -lz])
- VLC_ADD_PLUGIN([id3tag])
- ])
- ])
-])
AC_ARG_ENABLE(merge-ffmpeg,
[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
dnl
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
-if test "${enable_avcodec}" != "no"
-then
- PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.2.0 libavutil],
+AS_IF([test "${enable_avcodec}" != "no"], [
+ PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 52.25.0 libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
],[
AC_MSG_ERROR([Could not find libavcodec or libavutil. Use --disable-avcodec to ignore this error.])
])
-fi
+], [
+ have_avcodec="no"
+])
dnl
dnl libva needs avcodec
dnl
AC_ARG_ENABLE(avformat,
-[ --enable-avformat libavformat containers (default enabled)])
+[ --enable-avformat libavformat containers (default enabled)],, [
+ enable_avformat="${have_avcodec}"
+])
if test "${enable_avformat}" != "no"
then
- PKG_CHECK_MODULES(AVFORMAT,[libavformat libavutil],
+ PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavcodec libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
AC_ARG_ENABLE(swscale,
AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
- (default enabled)]))
+ (default enabled)]),, [
+ enable_swscale="${have_avcodec}"
+])
if test "${enable_swscale}" != "no"
then
PKG_CHECK_MODULES(SWSCALE,[libswscale],
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_screen xcb_apps])
+ VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_window xcb_screen xcb_apps])
AS_IF([test "${enable_xvideo}" != "no"], [
PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
], [
have_xcb_keysyms="no"
need_xid_provider="yes"
+ AC_MSG_WARN([libxcb-keysyms not found. Hotkeys will not be supported.])
])
])
AS_IF([test "${have_xcb_keysyms}" = "yes"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
- VLC_ADD_PLUGIN([xcb_window globalhotkeys])
+ VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
+ VLC_ADD_CFLAGS([xcb_window], [-DHAVE_XCB_KEYSYMS])
])
VLC_ADD_PLUGIN([xdg_screensaver])
])
if test "${SYS}" != "darwin"; then
VLC_ADD_PLUGIN([vout_sdl aout_sdl])
fi
+ if test "${SYS}" != "mingw32"; then
+ VLC_ADD_LIBS([vout_sdl],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+ fi
VLC_ADD_CFLAGS([vout_sdl aout_sdl],[${SDL_CFLAGS}])
VLC_ADD_LIBS([vout_sdl aout_sdl],[${SDL_LIBS}])
then
VLC_ADD_PLUGIN([aa])
VLC_ADD_LIBS([aa],[-laa])
+ if test "${SYS}" != "mingw32"; then
+ VLC_ADD_LIBS([aa],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+ fi
fi
fi
dnl OSS /dev/dsp module (enabled by default except on win32)
dnl
AC_ARG_ENABLE(oss,
- [ --enable-oss Linux OSS /dev/dsp support (enabled on Linux)])
+ [ --enable-oss Open Sound System OSS support (default enabled)])
if test "${enable_oss}" != "no" &&
(test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ||
dnl
dnl ALSA module
dnl
-PKG_ENABLE_MODULES_VLC([ALSA], [alsa access_alsa], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
+AC_ARG_ENABLE(alsa,
+ [ --enable-alsa Advanced Linux Sound Architecture (default auto)])
+have_alsa="no"
+AS_IF([test "${enable_alsa}" != "no"], [
+ PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.0], [
+ have_alsa="yes"
+ ], [
+ AS_IF([test "x${enable_alsa}" != "x"], [
+ AC_MSG_ERROR([alsa-lib not found])
+ ])
+ ])
+])
+AM_CONDITIONAL([HAVE_ALSA], [test "${have_alsa}" = "yes"])
dnl
dnl win32 waveOut plugin
AS_IF([test "${enable_qt4}" != "no"], [
PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.0], [
VLC_ADD_PLUGIN([qt4])
+ VLC_ADD_LIBS([qt4],[${QT4_LIBS}])
+ VLC_ADD_CXXFLAGS([qt4],[${QT4_CFLAGS}])
ALIASES="${ALIASES} qvlc"
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
- need_xid_provider="no"
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS}])
+
+ AC_LANG_PUSH([C++])
+ CPPFLAGS_save="${CXXFLAGS}"
+
+ AC_MSG_CHECKING([whether Qt uses X11])
+ CPPFLAGS="${CXXFLAGS} ${QT4_CFLAGS}"
+ AC_PREPROC_IFELSE([
+#include <QWidget>
+#if !defined (Q_WS_X11)
+# error Fail
+#endif
+ ], [
+ AC_MSG_RESULT([yes])
+ VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+ need_xid_provider="no"
+ VLC_ADD_CXXFLAGS([qt4],[${X_CFLAGS}])
], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
+ AC_MSG_RESULT([no])
+ ])
+
+ CPPFLAGS="${CPPFLAGS_save}"
+ AC_LANG_POP([C++])
+
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
+ VLC_ADD_LIBS([qt4],[-lole32])
])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_ARG_WITH(kde-solid,
AS_HELP_STRING([--with-kde-solid=PATH],
[KDE Solid actions directory (auto)]),, [
+
+if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ; then
with_kde_solid="yes"
+fi
])
soliddatadir=""
AS_IF([test "${with_kde_solid}" != "no"], [
modules/codec/wmafixed/Makefile
modules/control/Makefile
modules/control/http/Makefile
+ modules/control/dbus/Makefile
modules/control/globalhotkeys/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
projects / vlc / blobdiff