AC_CONFIG_LIBOBJ_DIR(compat)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
+AC_PRESERVE_HELP_ORDER
AM_INIT_AUTOMAKE(tar-ustar)
AM_CONFIG_HEADER(config.h)
AC_C_INLINE
AC_C_RESTRICT
+dnl Extend the --help string at the current spot.
+AC_DEFUN([EXTEND_HELP_STRING], [m4_divert_once([HELP_ENABLE], [$1])])
+
dnl Allow binary package maintainer to pass a custom string to avoid
dnl cache problem
AC_ARG_WITH(binary-version,
bsdi*)
SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
- VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx],[-ldvd])
+ VLC_ADD_LIBS([vcd cdda vcdx],[-ldvd])
;;
*bsd*)
SYS="${host_os}"
export MACOSX_DEPLOYMENT_TARGET
fi
;;
- darwin9*)
- if test "${host_cpu}" = "i386"; then
- dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code
- dnl without hacking it a lot, we disable mmx and sse.
- dnl (that bug is about ld being unable to handle
- dnl text relocation)
- save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS -dynamiclib -single_module -read_only_relocs suppress"
- AC_TRY_LINK(
- [int a;], [asm("movq _a,%mm0\n");],
- ac_ld_does_not_support_text_reloc=no,
- ac_ld_does_not_support_text_reloc=yes)
- CFLAGS="$save_cflags"
-
- if test "x$ac_ld_does_not_support_text_reloc" = "xyes"; then
- enable_mmx="no"
- echo " Assuming --disable-mmx (due to a bug in ld)"
- enable_sse="no"
- echo " Assuming --disable-sse (due to a bug in ld)"
- fi
- fi
- ;;
*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
AC_CHECK_TOOL(OBJCOPY, objcopy, :)
])
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([accept4 eventfd fstatfs vmsplice])
+AC_CHECK_FUNCS([accept4 dup3 eventfd fstatfs vmsplice])
AH_BOTTOM([#include <vlc_fixups.h>])
dnl
dnl Accelerated modules
dnl
-AC_ARG_WITH(,[])
-AC_ARG_WITH(,[Optimization options:])
+EXTEND_HELP_STRING([Optimization options:])
dnl Check for fully working MMX intrinsics
dnl We need support for -mmmx, we need <mmintrin.h>, and we also need a
LDFLAGS_save="${LDFLAGS}"
])
-dnl
-dnl Enable release-specific flags
-dnl
-AC_ARG_ENABLE(release,
-[ --enable-release activate extra optimizations (default disabled)])
-test "${enable_release}" != "yes" && enable_release="no"
-
dnl
dnl Stream output
dnl
else
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
+ AC_CHECK_PROGS(LUAC, luac)
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
dnl Input plugins
dnl
-AC_ARG_WITH(,[Input plugins:])
+EXTEND_HELP_STRING([Input plugins:])
dnl live555 input
dnl
AC_ARG_WITH(dvdread-tree,
[ --with-dvdread-tree=PATH libdvdread tree for static linking])
- dnl Temporary hack (yeah, sure ;)
- if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
- VLC_ADD_LIBS([dvdread],[-ldvdcss])
- fi
+ dnl prepend -ldvdcss on OS that need it
+ AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdread], [-ldvdcss])])
if test -z "${with_dvdread}"
then
then
AC_CHECK_HEADERS(dvdread/dvd_reader.h,
[ VLC_ADD_PLUGIN([dvdread])
- VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
+ VLC_ADD_LIBS([dvdread],[-ldvdread])
],[
AC_CHECK_HEADERS(libdvdread/dvd_reader.h,
[ VLC_ADD_PLUGIN([dvdread])
- VLC_ADD_LIBS([dvdread],[-ldvdread ${LIBS_dvdcss}])
+ VLC_ADD_LIBS([dvdread],[-ldvdread])
],[
if test -n "${enable_dvdread}"
then
dnl Use a custom libdvdread
AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
VLC_ADD_PLUGIN([dvdread])
- VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread ${LIBS_dvdcss}])
+ VLC_ADD_LIBS([dvdread],[-L${real_dvdread_tree}/dvdread/.libs -ldvdread])
VLC_ADD_CPPFLAGS([dvdread],[-I${real_dvdread_tree}])
else
dnl The given libdvdread wasn't built
dnl Use ${with_dvdread}/include/dvdread/dvd_reader.h
AC_MSG_RESULT(yes)
VLC_ADD_PLUGIN([dvdread])
- VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread ${LIBS_dvdcss}])
+ VLC_ADD_LIBS([dvdread],[-L${with_dvdread}/lib -ldvdread])
VLC_ADD_CPPFLAGS([dvdread],[-I${with_dvdread}/include])
else
dnl No libdvdread could be found, sorry
AC_MSG_ERROR([cannot find ${with_dvdread}/include/dvdread/dvd_reader.h])
fi
fi
+
+ dnl append -ldvd on OS that need it
+ AS_CASE(["${SYS}"], [bsdi], [VLC_ADD_LIBS([dvdread], [-ldvd])])
fi
dnl
[ --enable-dvdnav dvdnav input module (default enabled)])
if test "${enable_dvdnav}" != "no"
then
- dnl Same hack than dvdread
- if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
- VLC_ADD_LIBS([dvdnav],[-ldvdcss])
- fi
+ dnl prepend -ldvdcss on OS that need it
+ AS_CASE(["${SYS}"], [mingw32|darwin|beos], [VLC_ADD_LIBS([dvdnav], [-ldvdcss])])
DVDNAV_PATH="${PATH}"
AC_ARG_WITH(dvdnav-config-path,
dnl Codec plugins
dnl
-AC_ARG_WITH(,[Codec plugins:])
+EXTEND_HELP_STRING([Codec plugins:])
dnl
dnl wmafixed plugin
VLC_ADD_PLUGIN([shine])
fi
+dnl
+dnl openmax il codec plugin
+dnl
+AC_ARG_ENABLE(omxil,
+ [ --enable-omxil openmax il codec module (default disabled)])
+if test "${enable_omxil}" = "yes"
+then
+ VLC_ADD_PLUGIN([omxil])
+ VLC_ADD_LIBS([omxil], [-ldl])
+fi
+
dnl
dnl mad plugin
dnl
dnl Video plugins
dnl
-AC_ARG_WITH(,[Video plugins:])
+EXTEND_HELP_STRING([Video plugins:])
dnl
dnl Xlib
dnl Audio plugins
dnl
-AC_ARG_WITH(,[Audio plugins:])
+EXTEND_HELP_STRING([Audio plugins:])
dnl
dnl OSS /dev/dsp module (enabled by default except on win32)
dnl Interface plugins
dnl
-AC_ARG_WITH(,[Interface plugins:])
+EXTEND_HELP_STRING([Interface plugins:])
dnl
dnl Skins2 module
AC_ARG_ENABLE(hildon,
[ --enable-hildon Hildon touchscreen UI (default disabled)])
AS_IF([test "${enable_hildon}" = "yes"], [
- PKG_CHECK_MODULES(HILDON, [hildon-1 hildon-fm-2], [
- VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS}])
- VLC_ADD_LIBS([hildon],[${HILDON_LIBS}])
+ PKG_CHECK_MODULES(HILDON, [hildon-1], [
+ PKG_CHECK_MODULES(HILDON_FM, hildon-fm-2, [
+ VLC_ADD_CFLAGS([hildon],[${HILDON_FM_CFLAGS} -IHAVE_HILDON_FM])
+ VLC_ADD_LIBS([hildon],[${HILDON_FM_LIBS}])
+ ], [
+ AC_MSG_WARN(hildon-fm-2 not found)
+ ])
+ VLC_ADD_CFLAGS([hildon],[${HILDON_CFLAGS} ${X_CFLAGS}])
+ VLC_ADD_LIBS([hildon],[${HILDON_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_PLUGIN([hildon])
ALIASES="${ALIASES} mvlc"
need_xid_provider="no"
VLC_ADD_PLUGIN([qt4])
ALIASES="${ALIASES} qvlc"
AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
- VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS ${X_LIBS} ${X_PRE_LIBS} -lX11])
need_xid_provider="no"
], [
VLC_ADD_LIBS([qt4],[$QT4_LIBS -lole32])
])
QT4LOCALEDIR="$(eval $PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/"
AC_SUBST(QT4LOCALEDIR)
- VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
+ VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS ${X_CFLAGS} -DQT4LOCALEDIR=\\\\\\\"${QT4LOCALEDIR}\\\\\\\"])
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_PATH_PROGS(UIC, [uic-qt4 uic], uic,`eval $PKG_CONFIG --variable=exec_prefix QtCore`/bin)
dnl
dnl libprojectM visualization plugin
dnl
-PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto])
+AC_ARG_ENABLE(projectm,
+ [ --enable-projectm projectM visualization plugin (default enabled)])
+AS_IF([test "${enable_projectm}" != "no"],
+ [
+ PKG_CHECK_MODULES(PROJECTM, libprojectM,
+ [
+ VLC_ADD_PLUGIN([projectm])
+ VLC_ADD_CXXFLAGS([projectm],[$PROJECTM_CFLAGS])
+ VLC_ADD_LIBS([projectm],[$PROJECTM_LIBS])
+ PKG_CHECK_MODULES(PROJECTM2, [libprojectM >= 2.0.0],
+ [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM 2.x]) ],
+ [ AC_MSG_WARN( [Using libprojectM version 1] )
+ ])
+ ],[
+ AC_MSG_WARN([libprojectM library not found])
+ ])
+ ])
dnl
dnl AtmoLight (homemade Philips Ambilight clone)
fi
fi
-
-AC_ARG_WITH(,[Misc options:])
+EXTEND_HELP_STRING([Misc options:])
dnl
dnl libgcrypt
VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
-AC_ARG_WITH(,[Components:])
+EXTEND_HELP_STRING([Components:])
dnl
dnl the VLC binary
modules/codec/Makefile
modules/codec/avcodec/Makefile
modules/codec/dmo/Makefile
+ modules/codec/omxil/Makefile
modules/codec/shine/Makefile
modules/codec/subtitles/Makefile
modules/codec/spudec/Makefile
test "${enable_cprof}" = "yes" && printf "cprof "
test "${enable_gprof}" = "yes" && printf "gprof "
test "${enable_optimizations}" = "yes" && printf "optim "
-test "${enable_release}" = "yes" && printf "release " || printf "devel "
echo ""
if test "${enable_vlc}" != "no"; then
echo "vlc aliases :${ALIASES}"