X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=6833bd061470b776fa4f33015ef50da4ed5d6e2c;hb=51169d42596c89ca8b03fdfaa7d2e46c3a26411c;hp=31a769b92276544bd034fef6266dbb41c965794e;hpb=c06c0301e002ed750bcb9df86ca7caf2413ebca7;p=vlc diff --git a/configure.ac b/configure.ac index 31a769b922..6833bd0614 100644 --- a/configure.ac +++ b/configure.ac @@ -236,8 +236,6 @@ case "${host_os}" in 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" @@ -802,13 +800,17 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ 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 #include ]) +AC_CHECK_HEADERS([sys/mount.h], [], [], + [ + #include + ]) 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]) @@ -829,11 +831,6 @@ then 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) @@ -905,8 +902,8 @@ AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) 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" ]) ]) @@ -2126,42 +2123,6 @@ then 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 @@ -2660,8 +2621,8 @@ AS_IF([test "${enable_libva}" != "no"], [ 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" ],[ @@ -2768,9 +2729,7 @@ dnl 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], @@ -3487,6 +3446,23 @@ then 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 @@ -3890,10 +3866,10 @@ AS_IF([test "${enable_qt4}" != "no"], [ 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 #if !defined (Q_WS_X11) @@ -4705,17 +4681,9 @@ dnl Create vlc-config.in 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 @@ -4723,12 +4691,6 @@ AC_CONFIG_FILES([ 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 @@ -4813,6 +4775,46 @@ AC_CONFIG_FILES([ 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