x86_64*)
ARCH_flag="-arch x86_64"
;;
+ arm*)
+ ARCH_flag="-arch armv7"
+ ac_cv_c_bigendian="no"
+ ac_cv_c_attribute_packed="no"
+ ;;
esac
SYS=darwin
dnl Gettext stuff
dnl
AM_GNU_GETTEXT_VERSION([0.18.1])
-AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT([external], [need-ngettext])
dnl
dnl Iconv stuff
c = NULL;
])],[AC_DEFINE([HAVE_ASPRINTF],[1],[Define to 1 if you have asprintf function])],[AC_LIBOBJ([asprintf])])
AC_LINK_IFELSE([
- AC_LANG_PROGRAM([#include <stdio.h>], [
+ AC_LANG_PROGRAM([#include <stdio.h>
+ #include <stdarg.h>], [
char *c;
va_list ap;
if (vasprintf(&c, "%s %d", ap) == -1)
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
-dnl Manual switch for UTF-8
-AC_ARG_ENABLE(non-utf8,
- [AS_HELP_STRING([--enable-non-utf8],
- [support legacy non-UTF-8 systems (default disabled)])],, [
- AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce" -o "${SYS}" = "os2"], [
- 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,
[AS_HELP_STRING([--enable-dbus],
dnl - dv module: digital video module check for libraw1394
dnl - linsys modules: access module check for libzvbi
dnl
-PKG_ENABLE_MODULES_VLC([DC1394], [], [libraw1394 >= 2.0.1 libdc1394-2 >= 2.1.0], [dc1394 access module], [auto])
-PKG_ENABLE_MODULES_VLC([DV], [access_dv], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV input module], [auto])
+PKG_ENABLE_MODULES_VLC([DC1394], [], [libdc1394-2 >= 2.1.0], [IIDC FireWire input module], [auto])
+PKG_ENABLE_MODULES_VLC([DV1394], [], [libraw1394 >= 2.0.1 libavc1394 >= 0.5.3], [DV FireWire input module], [auto])
AC_ARG_ENABLE(linsys,
[AS_HELP_STRING([--enable-linsys],
AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
have_v4l2="yes"
])
+ AC_CHECK_DECLS([V4L2_CTRL_TYPE_BITMASK],,, [
+#ifdef HAVE_LINUX_VIDEODEV2_H
+# include <linux/videodev2.h>
+#endif
+#ifdef HAVE_SYS_VIDEOIO_H
+# include <sys/videoio.h>
+#endif
+ ])
])
AS_IF([test "$have_v4l2" = "yes"], [
AS_IF([test "${enable_pvr}" = "yes"], [
[AC_MSG_RESULT([yes])
AC_CHECK_HEADERS(matroska/KaxAttachments.h)
VLC_ADD_CXXFLAGS([mkv],[])
- if test "${SYS}" = "darwin"; then
- VLC_ADD_CXXFLAGS([mkv],[-O1])
- fi
AC_CHECK_LIB(ebml_pic, main, [
VLC_ADD_PLUGIN([mkv])
VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic])
AS_IF([test "${enable_switcher}" = "yes"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
VLC_ADD_PLUGIN([stream_out_switcher])
- VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS])
+ VLC_ADD_LIBS([stream_out_switcher],[$AVCODEC_LIBS $AVUTIL_LIBS $LIBM])
VLC_ADD_CFLAGS([stream_out_switcher],[$AVCODEC_CFLAGS $AVUTIL_CFLAGS])
],[AC_MSG_ERROR([Stream_out switcher depends on avcodec])
])
dnl faad decoder plugin
dnl
AC_ARG_ENABLE(faad,
-[ --enable-faad faad codec (default disabled)])
-if test "${enable_faad}" = "yes"
-then
- AC_ARG_WITH(faad-tree,
- [ --with-faad-tree=PATH faad tree for static linking])
- if test -n "${with_faad_tree}"
- then
+[ --enable-faad faad codec (default auto)])
+if test "${enable_faad}" != "no"; then
+ AC_ARG_WITH(faad-tree, [ --with-faad-tree=PATH faad tree for static linking])
+ if test -n "${with_faad_tree}"; then
AC_MSG_CHECKING(for libfaad.a in ${with_faad_tree})
real_faad_tree="`cd ${with_faad_tree} 2>/dev/null && pwd`"
- if test -z "${real_faad_tree}"
- then
+ if test -z "${real_faad_tree}"; then
dnl The given directory can't be found
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot cd to ${with_faad_tree}])
fi
- if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"
- then
- dnl Use a custom faad
+ if test -f "${real_faad_tree}/libfaad/.libs/libfaad.a"; then
+ dnl Use the custom faad
AC_MSG_RESULT(${real_faad_tree}/libfaad/.libs/libfaad.a)
VLC_ADD_PLUGIN([faad])
VLC_ADD_LIBS([faad],[${real_faad_tree}/libfaad/.libs/libfaad.a])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_faad}"
LDFLAGS="${LDFLAGS} ${LIBS_faad}"
- AC_CHECK_HEADERS(faad.h, ,
- [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ])
- AC_CHECK_LIB(faad, faacDecOpen, [
- VLC_ADD_PLUGIN([faad])
- VLC_ADD_LIBS([faad],[-lfaad]) ],
- AC_CHECK_LIB(faad, NeAACDecOpen, [
- VLC_ADD_PLUGIN([faad])
- VLC_ADD_LIBS([faad],[-lfaad]) ],
- [ AC_MSG_ERROR([Cannot find libfaad library...]) ]))
+ AC_CHECK_HEADERS(faad.h,
+ [ AC_CHECK_LIB(faad, faacDecOpen, [
+ VLC_ADD_PLUGIN([faad])
+ VLC_ADD_LIBS([faad],[-lfaad]) ], [
+ AC_CHECK_LIB(faad, NeAACDecOpen, [
+ VLC_ADD_PLUGIN([faad])
+ VLC_ADD_LIBS([faad],[-lfaad]) ], [
+ AS_IF([test "${enable_faad}" = "yes"],
+ [ AC_MSG_ERROR([Cannot find libfaad library...]) ],
+ [ AC_MSG_WARN([Cannot find libfaad library...]) ]) ]) ])
+ ] , [ AS_IF([test "${enable_faad}" = "yes"],
+ [ AC_MSG_ERROR([Cannot find development headers for libfaad...]) ],
+ [ AC_MSG_WARN([Cannot find development headers for libfaad...]) ]) ])
VLC_RESTORE_FLAGS
fi
fi
dnl
dnl libfluidsynth (MIDI synthetizer) plugin
dnl
-PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.0], [MIDI synthetiser with libfluidsynth], [auto])
+PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.2], [MIDI synthetiser with libfluidsynth], [auto])
dnl
dnl Teletext Modules
])
AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"])
+dnl
+dnl Windows Audio Session plugin
+dnl
+AC_ARG_ENABLE([wasapi],
+ [AS_HELP_STRING([--enable-wasapi],
+ [use the Windows Audio Session API (default auto)])
+])
+have_wasapi="no"
+AS_IF([test "$enable_wasapi" != "no"], [
+ AC_CHECK_HEADER([audioclient.h], [
+ have_wasapi="yes"
+ ], [
+ AS_IF([test "x${enable_wasapi}" != "x"], [
+ AC_MSG_ERROR([Windows Audio Session API not found.])
+ ])
+ ])
+])
+AM_CONDITIONAL([HAVE_WASAPI], [test "${have_wasapi}" = "yes"])
+
dnl
dnl win32 waveOut plugin
dnl
dnl Win32
AS_IF([test "${SYS}" = "mingw32"], [
- VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -Imodules/gui/skins2 -DWIN32_SKINS])
- VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
+ VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -DWIN32_SKINS])
VLC_ADD_LIBS([skins2],[-lgdi32 -lole32 -luuid -lmsimg32])
dnl MacOS
], [test "${SYS}" = "darwin"], [
- VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 -DMACOSX_SKINS])
- VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
+ VLC_ADD_CPPFLAGS([skins2],[ -DMACOSX_SKINS])
VLC_ADD_LIBS([skins2],[-Wl,-framework,Carbon])
dnl Linux/Unix
], [
PKG_CHECK_MODULES([XPM], [xpm],, [have_skins_deps="no"])
PKG_CHECK_MODULES([XINERAMA], [xinerama],, [have_skins_deps="no"])
PKG_CHECK_MODULES([XEXT], [xext],, [have_skins_deps="no"])
- VLC_ADD_CPPFLAGS([skins2],[-Imodules/gui/skins2 ${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS])
- VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
+ VLC_ADD_CPPFLAGS([skins2],[${X_CFLAGS} ${XEXT_CFLAGS} ${XPM_CFLAGS} -DX11_SKINS])
VLC_ADD_LIBS([skins2],[${X_LIBS} ${X_PRE_LIBS} ${XEXT_LIBS} ${XPM_LIBS} ${XINERAMA_LIBS} -lX11])
])
+ dnl for All OSes
+ VLC_ADD_CXXFLAGS([skins2],[-O2 -fno-rtti])
+
dnl we need freetype
AS_IF([test "${have_freetype}" != "yes"], [
have_skins_deps="no"
VLC_RESTORE_FLAGS
fi
-dnl
-dnl XOSD plugin
-dnl
-AC_ARG_ENABLE(xosd,
- [ --enable-xosd xosd interface support (default disabled)])
-if test "${enable_xosd}" = "yes"
-then
- AC_CHECK_HEADERS(xosd.h,
- AC_CHECK_LIB(xosd, xosd_set_horizontal_offset, [
- AS_IF([test "${no_x}" != "yes"], [
- VLC_ADD_PLUGIN([xosd])
- VLC_ADD_LIBS([xosd],[-lxosd ${X_LIBS} ${X_PRE_LIBS} -lX11])
- VLC_ADD_CFLAGS([xosd],[${X_CFLAGS}])
- ],[
- AC_MSG_ERROR([Xlib is required with xosd.])
- ])
- ])
- )
-fi
-
-dnl
-dnl Framebuffer (overlay) plugin
-dnl
-AC_ARG_ENABLE(fbosd,
- [ --enable-fbosd fbosd interface support (default disabled)])
-if test "${enable_fbosd}" = "yes"
-then
- AC_CHECK_HEADERS(linux/fb.h, [
- VLC_ADD_PLUGIN([fbosd])
- ])
-fi
-
dnl
dnl Lirc plugin
dnl
])
])
+dnl
+dnl Vovoid VSXu visualization plugin
+dnl
+AC_ARG_ENABLE(vsxu,
+ [ --enable-vsxu Vovoid VSXu visualization plugin (default auto)])
+AS_IF([test "${enable_vsxu}" != "no"],
+ [
+ PKG_CHECK_MODULES(VSXU, libvsxu,
+ [
+ VLC_ADD_PLUGIN([vsxu])
+ VLC_ADD_CXXFLAGS([vsxu],[$VSXU_CFLAGS])
+ VLC_ADD_LIBS([vsxu],[$VSXU_LIBS])
+ ],[
+ AC_MSG_WARN([${VSXU_PKG_ERRORS}.])
+ ])
+ ])
+
dnl
dnl AtmoLight (homemade Philips Ambilight clone)
dnl
enable_gnutls="no"
])
AS_IF([test "${enable_gnutls}" != "no"], [
- PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.0.0], [
+ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 2.6.6], [
VLC_ADD_PLUGIN([gnutls])
], [
AS_IF([test -n "${enable_gnutls}"], [
[ --enable-growl growl notification plugin (default disabled)],,
[enable_growl=no])
AS_IF([test "${enable_growl}" != "no"], [
- AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/GrowlDefines.h, [
+ AC_CHECK_HEADERS(${CONTRIB_DIR}/Growl.framework/Versions/A/Headers/Growl.h, [
VLC_ADD_PLUGIN([growl])
- VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,CoreFoundation])
+ VLC_ADD_LIBS([growl], [-F${CONTRIB_DIR} -Wl,-framework,Growl,-framework,Foundation])
VLC_ADD_OBJCFLAGS([growl], [-F${CONTRIB_DIR}])
VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] )
])