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"
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}])
fi
-dnl
-dnl Video4Linux plugin
-dnl
-AC_ARG_ENABLE(v4l,
- [ --enable-v4l Video4Linux input support (default disabled)])
-if test "${enable_v4l}" = "yes"
-then
- AC_ARG_WITH(v4l,
- [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[])
- if test "${with_v4l}" != "no" -a -n "${with_v4l}"
- then
- VLC_ADD_CPPFLAGS([v4l],[-I${with_v4l}/include])
- fi
-
- CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l}"
- AC_CHECK_HEADERS(linux/videodev.h, [
- VLC_ADD_PLUGIN([v4l])
- ],[])
- CPPFLAGS="${CPPFLAGS_save}"
-fi
-
-dnl
-dnl libv4l1 support for video4linux.
-dnl
-AC_ARG_ENABLE( libv4l,
- [ --enable-libv4l Libv4l Video4Linux support (default enabled)])
-if test "${enable_libv4l}" != "no" -a "${enable_v4l}" != "no"
-then
- PKG_CHECK_MODULES( LIBV4L, libv4l1, [
- VLC_ADD_LDFLAGS([v4l],[${LIBV4L_LIBS}])
- VLC_ADD_CFLAGS([v4l],[${LIBV4L_CFLAGS}])
- AC_DEFINE(HAVE_LIBV4L1, 1, Define if libv4l is available)],
- AC_MSG_WARN([LibV4L support disabled because libv4l development headers were not found])
- )
-fi
-
dnl
dnl Video4Linux2 plugin
dnl
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
AC_CHECK_HEADERS(libavcodec/vaapi.h, [
- VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
- VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
+ VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
+ VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS ${X_CFLAGS}])
AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
echo "VAAPI acceleration activated"
],[
])
if test "${enable_avformat}" != "no"
then
- PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavutil],
+ PKG_CHECK_MODULES(AVFORMAT,[libavformat > 52.30.0 libavcodec libavutil],
[
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
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="${CPPFLAGS}"
+
+ AC_MSG_CHECKING([whether Qt uses X11])
+ CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
+ AC_PREPROC_IFELSE([
+#include <QWidget>
+#if !defined (Q_WS_X11)
+# error Fail
+#endif
], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
+ AC_MSG_RESULT([yes])
+ VLC_ADD_LIBS([qt4],[${X_LIBS} ${X_PRE_LIBS} -lX11])
+ need_xid_provider="no"
+ VLC_ADD_CXXFLAGS([qt4],[${X_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)
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
- extras/package/win32/spad.nsi
- extras/package/win32/vlc.win32.nsi
- extras/package/macosx/Info.plist
- extras/package/macosx/Resources/English.lproj/InfoPlist.strings
- extras/package/macosx/plugin/Info.plist
- extras/package/macosx/plugin/InstallerInfo.plist
Makefile
projects/activex/Makefile
- projects/activex/axvlc.inf
doc/Makefile
- extras/package/ipkg/Makefile
libs/loader/Makefile
libs/srtp/Makefile
libs/unzip/Makefile
projects/mozilla/Makefile
m4/Makefile
po/Makefile.in
- projects/activex/axvlc_rc.rc
- projects/mozilla/npvlc_rc.rc
- projects/mozilla/vlc.r
- projects/mozilla/install.js
- projects/mozilla/install.rdf
- projects/mozilla/manifest.json
share/Makefile
compat/Makefile
src/Makefile
modules/arm_neon/Makefile
])
+AM_COND_IF([BUILD_MOZILLA], [
+ AC_CONFIG_FILES([
+ projects/mozilla/install.js
+ projects/mozilla/install.rdf
+ projects/mozilla/manifest.json
+ ])
+])
+
+AM_COND_IF([HAVE_WIN32], [
+ AC_CONFIG_FILES([
+ extras/package/win32/spad.nsi
+ extras/package/win32/vlc.win32.nsi
+ ])
+ AM_COND_IF([BUILD_ACTIVEX], [
+ AC_CONFIG_FILES([
+ projects/activex/axvlc.inf
+ projects/activex/axvlc_rc.rc
+ ])
+ ])
+ AM_COND_IF([BUILD_MOZILLA], [
+ AC_CONFIG_FILES([
+ projects/mozilla/npvlc_rc.rc
+ ])
+ ])
+])
+
+AM_COND_IF([HAVE_DARWIN], [
+ AC_CONFIG_FILES([
+ extras/package/macosx/Info.plist
+ extras/package/macosx/Resources/English.lproj/InfoPlist.strings
+ extras/package/macosx/plugin/Info.plist
+ extras/package/macosx/plugin/InstallerInfo.plist
+ ])
+ AM_COND_IF([BUILD_MOZILLA], [
+ AC_CONFIG_FILES([
+ projects/mozilla/vlc.r
+ ])
+ ])
+])
+
dnl Generate makefiles
AC_OUTPUT
projects / vlc / blobdiff