dnl Force gcc "-arch" flag
ARCH_flag=""
case "${host}" in
- i386*)
+ i?86*)
ARCH_flag="-arch i386"
;;
ppc64*)
AC_ARG_WITH(macosx-sdk,
[AS_HELP_STRING([--with-macosx-sdk=DIR],
[compile using the SDK in DIR])])
- test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.5.sdk
+ test "${with_macosx_sdk}" = "" && with_macosx_sdk=/Developer/SDKs/MacOSX10.6.sdk
! test -d "${with_macosx_sdk}" && AC_MSG_ERROR([SDK "${with_macosx_sdk}" not found])
- CPP="${CPP} -isysroot ${with_macosx_sdk}"
- CC="${CC} -isysroot ${with_macosx_sdk}"
- CXX="${CXX} -isysroot ${with_macosx_sdk}"
- OBJC="${OBJC} -isysroot ${with_macosx_sdk}"
- LD="${LD} -syslibroot ${with_macosx_sdk}"
AC_ARG_WITH(macosx-version-min,
[AS_HELP_STRING([--with-macosx-version-min=VERSION],
[compile for MacOS X VERSION and above])])
- if test "${with_macosx_version_min}" != "" ; then
- CPP="${CPP} -mmacosx-version-min=${with_macosx_version_min}"
- CC="${CC} -mmacosx-version-min=${with_macosx_version_min}"
- CXX="${CXX} -mmacosx-version-min=${with_macosx_version_min}"
- OBJC="${OBJC} -mmacosx-version-min=${with_macosx_version_min}"
- LD="${LD} -macosx_version_min=${with_macosx_version_min}"
- CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
- MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
- export MACOSX_DEPLOYMENT_TARGET
+ if test "${with_macosx_version_min}" = "" ; then
+ with_macosx_version_min=10.5
fi
+ MACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}
+ CPP="${CPP} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
+ CC="${CC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
+ CXX="${CXX} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
+ OBJC="${OBJC} -isysroot ${with_macosx_sdk} -mmacosx-version-min=${with_macosx_version_min}"
+ LD="${LD} -syslibroot ${with_macosx_sdk} -mmacosx_version_min=${with_macosx_version_min}"
+ CFLAGS="${CFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ CXXFLAGS="${CXXFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ OBJCFLAGS="${OBJCFLAGS} -DMACOSX_DEPLOYMENT_TARGET=${with_macosx_version_min}"
+ export MACOSX_DEPLOYMENT_TARGET
;;
*mingw32* | *cygwin* | *wince* | *mingwce*)
AC_CHECK_TOOL(WINDRES, windres, :)
dnl
dnl Blu-ray Disc Support with libbluray
dnl
-PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2 libxml-2.0 >= 2.6 ], (libbluray for Blu-ray disc support ) )
+PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) )
dnl
dnl OpenCV wrapper and example filters
[ --enable-iomx iomx codec module (default disabled)])
if test "${enable_iomx}" = "yes"
then
- VLC_SAVE_FLAGS
- CPPFLAGS="${CPPFLAGS} -I${srcdir}/modules/codec/omxil" # For the OMX headers
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(media/stagefright/OMXClient.h, [
- VLC_ADD_PLUGIN([iomx])
- VLC_ADD_CXXFLAGS([iomx], [-fno-exceptions -fno-rtti])
- VLC_ADD_LIBS([iomx], [-lstagefright -lmedia -lutils -lbinder])
- ], [
- AC_MSG_ERROR("Could not find IOMX headers")
- ])
- AC_LANG_POP([C++])
- VLC_RESTORE_FLAGS
+ VLC_ADD_PLUGIN([iomx])
fi
dnl
AS_IF([test "${enable_dxva2}" = "yes"],
[AC_MSG_ERROR([dxva2 is present but libavcodec/dxva2.h is missing])],
[AC_MSG_WARN([dxva2 is present but libavcodec/dxva2.h is missing ])])
- ])
+ ], [#undef _WIN32_WINNT
+ /* DXVA2 is only available in Vista and above */
+ #define _WIN32_WINNT 0x600])
],[
AS_IF([test "${enable_dxva2}" = "yes"],
[AC_MSG_ERROR([Could not find required dxva2api.h])],
PKG_CHECK_MODULES([SPEEXDSP], [speexdsp], [
have_speexdsp="yes"
], [
- AS_IF([test -n "${enable_speex}"], [
- AC_MSG_ERROR([${SPEEXDSP_PKG_ERRORS}.])
- ], [
- AC_MSG_WARN([${SPEEXDSP_PKG_ERRORS}.])
- ])
+ AC_MSG_WARN([${SPEEXDSP_PKG_ERRORS}.])
])
])
AM_CONDITIONAL([HAVE_SPEEXDSP], [test "$have_speexdsp" = "yes"])
VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit])
- VLC_SAVE_FLAGS
- CFLAGS="-I${CONTRIB_DIR}/Sparkle.framework/Headers ${CFLAGS}"
- AC_CHECK_HEADERS(Sparkle.h, [
- VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
- VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
- ], VLC_RESTORE_FLAGS)
+ if ! test -d ${CONTRIB_DIR}/Sparkle.framework
+ then
+ AC_MSG_ERROR([Sparkle framework is required and was not found in ${CONTRIB_DIR}])
+ fi
+ VLC_ADD_LIBS([macosx], [-F${CONTRIB_DIR} -Wl,-framework,Sparkle])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}])
if ! test -d ${CONTRIB_DIR}/BGHUDAppKit.framework
then
dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
- [ --disable-ncurses ncurses interface support (default disabled)],
- [if test "${enable_ncurses}" != "no"; then
- AC_CHECK_HEADER(ncurses.h,
- [AC_CHECK_LIB(ncursesw, mvprintw,
- [VLC_ADD_PLUGIN([ncurses])
- VLC_ADD_LIBS([ncurses],[-lncursesw])
+[AS_HELP_STRING([--disable-ncurses],[ncurses text-based interface (default auto)])])
+if test "${enable_ncurses}" != "no"; then
+ VLC_SAVE_FLAGS
+ LIBS=""
+ AC_CHECK_HEADER(ncurses.h, [
+ AC_CHECK_LIB(ncursesw, mvprintw, [
+ AC_SEARCH_LIBS([tgetent], [ncursesw tinfow tinfo], [
+ VLC_ADD_PLUGIN([ncurses])
ALIASES="${ALIASES} nvlc"
- AC_CHECK_LIB(ncursesw, tgetent, [],
- AC_CHECK_LIB(tinfow, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfow])],
- [AC_CHECK_LIB(tinfo, tgetent, [VLC_ADD_LIBS([ncurses],[-ltinfo])],
- [AS_IF([test "${enable_ncurses}" = "yes"],
- [AC_MSG_ERROR([tgetent not found in ncursesw tinfow tinfo]
- )])])
- ]
- )
- )
- ],
- [AS_IF([test "${enable_ncurses}" = "yes"], [
- AC_MSG_ERROR([libncursesw not found])])]
- )],
- [AS_IF([test "${enable_ncurses}" = "yes"], [
- AC_MSG_ERROR([ncurses.h not found])])]
- )
- fi]
-)
+ VLC_ADD_LIBS([ncurses],[-lncursesw ${LIBS}])
+ ], [
+ AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([tgetent not found])])
+ ])
+ ], [
+ AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([libncursesw not found])])
+ ])
+ ], [
+ AS_IF([test "${enable_ncurses}" = "yes"], [AC_MSG_ERROR([ncurses.h not found])])
+ ])
+ VLC_RESTORE_FLAGS
+fi
dnl
dnl XOSD plugin
then
AC_CHECK_HEADERS(xosd.h,
AC_CHECK_LIB(xosd, xosd_set_horizontal_offset, [
- VLC_ADD_PLUGIN([xosd])
- VLC_ADD_LIBS([xosd],[-lxosd])
+ 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
AS_HELP_STRING([--with-kde-solid=PATH],
[KDE Solid actions directory (auto)]),, [
-if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" ; then
+if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin" ; then
with_kde_solid="yes"
fi
])
modules/access/Makefile
modules/access/bd/Makefile
modules/access/dshow/Makefile
+ modules/access/dvb/Makefile
modules/access/mms/Makefile
modules/access/rtp/Makefile
modules/access/rtsp/Makefile
projects / vlc / blobdiff