build_dir=`pwd`
echo " Assuming --prefix=${build_dir}/vlc_install_dir"
ac_default_prefix="${build_dir}/vlc_install_dir"
- enable_macosx="yes"
- echo " Assuming --enable-macosx"
enable_faad="yes"
echo " Assuming --enable-faad"
enable_flac="yes"
dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h)
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
#include <sys/types.h>
#include <sys/socket.h>
])
+AC_CHECK_HEADERS([sys/mount.h], [], [],
+ [
+ #include <sys/param.h>
+ ])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
fi
])
-dnl Check for dirent
-need_dirent=false
-AC_CHECK_HEADERS(dirent.h,,[need_dirent=:])
-AM_CONDITIONAL(BUILD_DIRENT, ${need_dirent})
-
dnl Mac OS X and other OSes don't have declaration for nanosleep
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_MSG_CHECKING(for nanosleep in time.h)
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 Legacy non-UTF-8 systems support (default disabled)],, [
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"], [
enable_non_utf8="no"
])
])
AC_CHECK_LIB(dvdnav, dvdnav_get_video_resolution,
AC_DEFINE(HAVE_DVDNAV_GET_VIDEO_RESOLUTION, 1, [Define if you have dvdnav_get_video_resolution.]),
[], [${LIBS_dvdnav}])
+ AC_CHECK_LIB(dvdnav, dvdnav_describe_title_chapters,
+ AC_DEFINE(HAVE_DVDNAV_DESCRIBE_TITLE_CHAPTERS, 1, [Define if you have dvdnav_describe_title_chapters.]),
+ [], [${LIBS_dvdnav}])
fi
fi
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"
],[
AC_ARG_ENABLE(swscale,
AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion
- (default enabled)]),, [
- enable_swscale="${have_avcodec}"
-])
+ (default enabled)]))
if test "${enable_swscale}" != "no"
then
PKG_CHECK_MODULES(SWSCALE,[libswscale],
fi
fi
+dnl
+dnl Windows Direct2D plugin
+dnl
+AC_ARG_ENABLE(direct2d,
+ [ --enable-direct2d Win7/VistaPU Direct2D support (default auto on Win32)])
+if test "${enable_direct2d}" != "no"; then
+ if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
+ then
+ AC_CHECK_HEADERS(d2d1.h,
+ [
+ VLC_ADD_PLUGIN([direct2d])
+ VLC_ADD_LIBS([direct2d],[-lgdi32 -lole32])
+ ], [AC_MSG_WARN([Cannot find Direct2D headers!])]
+ )
+ fi
+fi
+
dnl
dnl win32 GDI plugin
dnl
dnl
PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto])
-
-dnl
-dnl CyberLink for C++ UPnP stack
-dnl
-AC_ARG_ENABLE(cyberlink,
- [ --enable-cyberlink CyberLink for C++ UPnP stack (default disabled)])
- AS_IF([test "${enable_cyberlink}" = "yes" ], [
- AC_ARG_WITH(cyberlink-tree,
- [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
-
- dnl
- dnl test for --with-cyberlink-tree
- dnl
- AS_IF([test ! -z "${with_cyberlink_tree}" -a "${CXX}" != ""], [
- AC_LANG_PUSH(C++)
- real_cyberlink_tree="`cd ${with_cyberlink_tree} 2>/dev/null && pwd`"
- AS_IF([test -z "${real_cyberlink_tree}"], [
- dnl The given directory can't be found
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot cd to ${with_cyberlink_tree}])
- ])
- CPPFLAGS_save="${CPPFLAGS}"
- CPPFLAGS_cyberlink="-I${real_cyberlink_tree}/include"
- CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}"
- AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h],
- [ VLC_ADD_CXXFLAGS([upnp_cc], [${CPPFLAGS_cyberlink}])
- VLC_ADD_PLUGIN([upnp_cc])
- ],[
- AC_MSG_ERROR([cannot find CyberLink for C++ headers])
- ])
- AC_MSG_CHECKING(for libclink.a in ${with_cyberlink_tree})
- AS_IF([test -f "${real_cyberlink_tree}/lib/unix/libclink.a"], [
- AC_MSG_RESULT(${real_cyberlink_tree}/lib/unix/libclink.a)
- dnl The mere fact that we have to make such an ugly check sucks
- AC_MSG_CHECKING(for XML parser to link CyberLink with)
- LIBS_save="$LIBS"
- LIBS_cclink="no"
- for l in "`xml2-config --libs`" -lexpat -lxerces-c; do
- LIBS="$LIBS_save ${real_cyberlink_tree}/lib/unix/libclink.a -lpthread $l"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
-#include <cybergarage/upnp/media/player/MediaPlayer.h>
-using namespace CyberLink;
-
-class testclass : public SearchResponseListener, public MediaPlayer
-{
- virtual void deviceSearchResponseReceived( SSDPPacket *)
- {
- }
-
- public:
- testclass (void)
- {
- addSearchResponseListener (this);
- start ();
- }
-};
-],[testclass l;])],[LIBS_cclink="$l"])
- done
- LIBS="${LIBS_save}"
- dnl should not happen - otherwise this needs fixing - hence FAILURE
- AS_IF([test "${LIBS_cclink}" = "no"],
- [AC_MSG_FAILURE([cannot find XML parser for CyberLink])])
- AC_MSG_RESULT([${LIBS_cclink}])
- VLC_ADD_LIBS([upnp_cc], [${real_cyberlink_tree}/lib/unix/libclink.a -lpthread ${LIBS_cclink}])
- ], [
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_cyberlink_tree}/lib/unix/libclink.a, make sure you compiled CyberLink for C++ in ${with_cyberlink_tree}])
- ])
- CPPFLAGS="${CPPFLAGS_save}"
- AC_LANG_POP([C++])
- ])
-])
-
dnl
dnl UPnP Plugin (Intel SDK)
dnl
PKG_ENABLE_MODULES_VLC([UPNP], [upnp_intel], [libupnp], [Intel UPnp SDK],[auto])
-
dnl
dnl Interface plugins
dnl
ALIASES="${ALIASES} qvlc"
AC_LANG_PUSH([C++])
- CPPFLAGS_save="${CXXFLAGS}"
+ CPPFLAGS_save="${CPPFLAGS}"
AC_MSG_CHECKING([whether Qt uses X11])
- CPPFLAGS="${CXXFLAGS} ${QT4_CFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${QT4_CFLAGS}"
AC_PREPROC_IFELSE([
#include <QWidget>
#if !defined (Q_WS_X11)