X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=c4e777ae7c083cccc570e7ca323cdcbd2e3b9939;hb=951b94d3c2bc951fa942bf5c41594372a880d2d5;hp=94b101e6b9fdd751509deeec65279c0ed15c088f;hpb=d7a089ec05fef749be5fceb23689560fa7445255;p=vlc diff --git a/configure.ac b/configure.ac index 94b101e6b9..c4e777ae7c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,18 +1,23 @@ dnl Autoconf settings for vlc +AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team]) + AC_INIT(vlc, 1.0.0-git) VERSION_MAJOR="1" VERSION_MINOR="0" VERSION_REVISION="0" VERSION_EXTRA="-git" +PKGDIR="vlc" +AC_SUBST(PKGDIR) CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`" CODENAME="Goldeneye" -COPYRIGHT_YEARS="1996-2008" +COPYRIGHT_YEARS="1996-2009" AC_PREREQ(2.59c) AC_CONFIG_SRCDIR(src/libvlc.c) AC_CONFIG_AUX_DIR(autotools) +AC_CONFIG_MACRO_DIR(m4) AC_CANONICAL_BUILD AC_CANONICAL_HOST @@ -26,9 +31,19 @@ dnl automake behavior, you've likely never heard of maintainer mode, so we dnl can't expect you to enable it manually. AS_IF([test "x${enable_maintainer_mode}" != "xno"], - [enable_maintainer_mode="yes"]) + [enable_maintainer_mode="yes"]) AM_MAINTAINER_MODE +dnl +dnl Directories +dnl +dnl vlcincludedir="\${includedir}/\${PKGDIR}" +dnl AC_SUBST(vlcincludedir) +vlcdatadir="\${datadir}/\${PKGDIR}" +AC_SUBST(vlcdatadir) +vlclibdir="\${libdir}/\${PKGDIR}" +AC_SUBST(vlclibdir) + dnl dnl Deprecated options dnl to notify packagers that stuff has changed @@ -81,9 +96,9 @@ AC_C_CONST AC_C_INLINE AC_C_RESTRICT -dnl Allow binary package maintainer to pass a custom string to avoid +dnl Allow binary package maintainer to pass a custom string to avoid dnl cache problem -AC_ARG_WITH(binary-version, +AC_ARG_WITH(binary-version, AS_HELP_STRING([--with-binary-version=STRING], [To avoid plugins cache problem between binary version]),[],[]) AS_IF([test -n "${with_binary_version}"],[ @@ -197,14 +212,15 @@ case "${host_os}" in VLC_ADD_LDFLAGS([libvlc],[-Wl,-framework,CoreFoundation]) VLC_ADD_LDFLAGS([motion],[-Wl,-framework,IOKit,-framework,CoreFoundation]) AC_ARG_ENABLE(macosx-defaults, - AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration - on Mac OS X (default enabled)])) + AS_HELP_STRING([--enable-macosx-defaults],[Build the default configuration on Mac OS X (default enabled)])) if test "x${enable_macosx_defaults}" != "xno" then echo "" echo "Building with Mac OS X defaults:" - with_macosx_version_min="10.4" - echo " Assuming --with-macosx-version-min=10.4" + with_macosx_version_min="10.5" + echo " Assuming --with-macosx-version-min=10.5" + with_macosx_sdk="/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" + echo " Assuming --with-macosx-sdk=/Developer/SDKs/MacOSX${with_macosx_version_min}.sdk" build_dir=`pwd` echo " Assuming --prefix=${build_dir}/vlc_install_dir" ac_default_prefix="${build_dir}/vlc_install_dir" @@ -274,8 +290,8 @@ case "${host_os}" in AC_ARG_WITH(macosx-sdk, [ --with-macosx-sdk=DIR compile using the SDK in DIR]) if test "${with_macosx_sdk}" != "" ; then - CPP="${CPP} -isysroot ${with_macosx_sdk}" - CC="${CC} -isysroot ${with_macosx_sdk}" + 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}" @@ -283,8 +299,8 @@ case "${host_os}" in AC_ARG_WITH(macosx-version-min, [ --with-macosx-version-min=VERSION compile for MacOSX 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}" + 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}" @@ -297,6 +313,7 @@ case "${host_os}" in ;; *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*) AC_CHECK_TOOL(WINDRES, windres, :) + AC_CHECK_TOOL(OBJCOPY, objcopy, :) case "${host_os}" in *wince* | *mingwce* | *mingw32ce* | *pe*) @@ -341,7 +358,7 @@ case "${host_os}" in solaris*) SYS=solaris # _POSIX_PTHREAD_SEMANTICS is needed to get the POSIX ctime_r - # Perhaps it is useful other places as well? + # Perhaps it is useful other places as well? CFLAGS_save="${CFLAGS_save} -D_POSIX_PTHREAD_SEMANTICS"; CFLAGS="${CFLAGS_save}" ;; hpux*) @@ -380,7 +397,7 @@ AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32") AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce") dnl -dnl Sadly autoconf doesn't think about testing foo.exe when ask to test +dnl Sadly autoconf doesn't think about testing foo.exe when ask to test dnl for program foo on win32 case "${build_os}" in @@ -391,7 +408,7 @@ case "${build_os}" in ;; esac -dnl +dnl dnl Libtool dnl It's very bad, but our former custom system was worst dnl -- Courmisch @@ -492,13 +509,16 @@ dnl Check for system libs needed need_libc=false dnl Check for usual libc functions -AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise uselocale vmsplice]) +AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid_r memalign posix_memalign if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon scandir fork bsearch lstat strlcpy strdup strndup strnlen atof lldiv posix_fadvise posix_madvise uselocale]) AC_CHECK_FUNCS(strcasecmp,,[AC_CHECK_FUNCS(stricmp)]) AC_CHECK_FUNCS(strncasecmp,,[AC_CHECK_FUNCS(strnicmp)]) AC_CHECK_FUNCS(strcasestr,,[AC_CHECK_FUNCS(stristr)]) AC_FUNC_ALLOCA AC_CHECK_FUNCS(fcntl) +dnl Check for Linux system calls +AC_CHECK_FUNCS([vmsplice]) + AH_BOTTOM([#include ]) AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])]) @@ -532,9 +552,6 @@ AC_CHECK_FUNCS(send,,[ ]) ]) -AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LIBS([access_http],[-lz]) -]) dnl Check for socklen_t AH_TEMPLATE(socklen_t, [Define to `int' if does not define.]) @@ -778,7 +795,7 @@ AC_CHECK_FUNCS(nanosleep,have_nanosleep=:,[ if ${have_nanosleep}; then AC_DEFINE(HAVE_NANOSLEEP, 1, [Define if nanosleep is available.]) fi -fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" dnl Check for misc headers AC_MSG_CHECKING(for strncasecmp in strings.h) @@ -791,7 +808,7 @@ AC_EGREP_HEADER(strncasecmp,strings.h,[ dnl Check for headers AC_CHECK_HEADERS(signal.h time.h errno.h stdint.h stdbool.h getopt.h strings.h inttypes.h sys/int_types.h wchar.h locale.h) AC_CHECK_HEADERS(sys/sockio.h fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h xlocale.h) -AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h]) +AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h]) AC_CHECK_HEADERS([net/if.h], [], [], [ #include @@ -850,19 +867,43 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then AC_CHECK_HEADERS(pthread.h) fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -dnl Find where are the X headers and libraries -AC_PATH_XTRA() - dnl it seems that autoconf do the pkg-config detection only for the first PKG_CHECK_MODULES in the configure.ac ( which is logical) but in our case it is nested in a if so it was not working if you're not on linux or have disable hal. dnl Make PKG_CONFIG_PATH precious so that it appears in the help and get saved -AC_ARG_VAR(PKG_CONFIG_PATH, +AC_ARG_VAR(PKG_CONFIG_PATH, [Paths where to find .pc not at the default location]) PKG_PROG_PKG_CONFIG() +dnl +dnl Check for zlib.h and -lz along with system -lminizip if available +dnl +AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) +AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) +if test "${have_zlib}" = "yes" +then + VLC_ADD_LIBS([access_http gme mp4 skins2 sap mkv unzip zip],[-lz]) + PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ + AC_CHECK_HEADERS([unzip.h], [ + have_minizip=yes + MINIZIP_LIBS="-lminizip -lz" + ], [ + have_minizip=no + MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip" + MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la" + ]) + ]) + VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS]) + VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS]) + VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS]) + VLC_ADD_PLUGIN([unzip]) + VLC_ADD_PLUGIN([zip]) +fi +AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) + + dnl Check for hal AC_ARG_ENABLE(hal, [ --enable-hal Linux HAL services discovery (default enabled)]) - + if test "${enable_hal}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" then PKG_CHECK_MODULES(HAL, hal >= 0.5.0, @@ -876,6 +917,21 @@ then ) fi +dnl Check for mtp +AC_ARG_ENABLE(mtp, + [ --enable-mtp MTP devices support (default enabled)]) + +if test "${enable_mtp}" != "no" -a "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" +then + PKG_CHECK_MODULES(MTP, libmtp >= 0.3.0, + [ VLC_ADD_PLUGIN([mtp]) + VLC_ADD_PLUGIN([access_mtp]) + VLC_ADD_LIBS([mtp access_mtp],[$MTP_LIBS]) + VLC_ADD_CFLAGS([mtp access_mtp],[$MTP_CFLAGS])], + [AC_MSG_WARN(MTP library not found)] + ) +fi + dnl Check for dbus AC_ARG_ENABLE(dbus, [ --enable-dbus Linux D-BUS message bus system (default enabled)]) @@ -946,7 +1002,7 @@ AC_CACHE_CHECK([if \$CC accepts -Os], AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) if test "${ac_cv_c_os}" != "no"; then CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -Os" -else +else AC_CACHE_CHECK([if \$CC accepts -O], [ac_cv_c_o], [CFLAGS="${CFLAGS_save} -O" @@ -958,26 +1014,34 @@ else fi fi -AC_CACHE_CHECK([if \$CC accepts -O3], - [ac_cv_c_o3], - [CFLAGS="${CFLAGS_save} -O3" - AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) -if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3" +AC_CACHE_CHECK([if \$CC accepts -O4], + [ac_cv_c_o4], + [CFLAGS="${CFLAGS_save} -O4" + AC_TRY_COMPILE([],,ac_cv_c_o4=yes, ac_cv_c_o4=no)]) +if test "${ac_cv_c_o4}" != "no" -a "x${enable_debug}" = "xno"; then + CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O4" else - AC_CACHE_CHECK([if \$CC accepts -O2], - [ac_cv_c_o2], - [CFLAGS="${CFLAGS_save} -O2" - AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) - if test "${ac_cv_c_o2}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2" + AC_CACHE_CHECK([if \$CC accepts -O3], + [ac_cv_c_o3], + [CFLAGS="${CFLAGS_save} -O3" + AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) + if test "${ac_cv_c_o3}" != "no" -a "x${enable_debug}" = "xno"; then + CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3" else - AC_CACHE_CHECK([if \$CC accepts -O], - [ac_cv_c_o], - [CFLAGS="${CFLAGS_save} -O" - AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) - if test "${ac_cv_c_o}" != "no"; then - CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O" + AC_CACHE_CHECK([if \$CC accepts -O2], + [ac_cv_c_o2], + [CFLAGS="${CFLAGS_save} -O2" + AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) + if test "${ac_cv_c_o2}" != "no"; then + CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2" + else + AC_CACHE_CHECK([if \$CC accepts -O], + [ac_cv_c_o], + [CFLAGS="${CFLAGS_save} -O" + AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) + if test "${ac_cv_c_o}" != "no"; then + CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O" + fi fi fi fi @@ -1176,6 +1240,28 @@ if test "${SYS}" != "mingwce"; then ALIASES="${ALIASES} rvlc" fi +if test "${SYS}" = "mingwce"; then + VLC_ADD_PLUGIN([chain]) + VLC_ADD_PLUGIN([aout_file]) + VLC_ADD_PLUGIN([linear_resampler]) + VLC_ADD_PLUGIN([bandlimited_resampler]) + VLC_ADD_PLUGIN([float32_mixer]) + VLC_ADD_PLUGIN([spdif_mixer]) + VLC_ADD_PLUGIN([simple_channel_mixer]) + VLC_ADD_PLUGIN([headphone_channel_mixer]) + VLC_ADD_PLUGIN([normvol]) + VLC_ADD_PLUGIN([converter_float]) + VLC_ADD_PLUGIN([a52tospdif]) + VLC_ADD_PLUGIN([dtstospdif]) + VLC_ADD_PLUGIN([audio_format]) + VLC_ADD_PLUGIN([i420_yuy2]) + VLC_ADD_PLUGIN([i422_yuy2]) + VLC_ADD_PLUGIN([i420_ymga]) + VLC_ADD_PLUGIN([i422_i420]) + VLC_ADD_PLUGIN([yuy2_i422]) + VLC_ADD_PLUGIN([yuy2_i420]) +fi + dnl dnl Some plugins aren't useful on some platforms dnl @@ -1190,6 +1276,7 @@ elif test "${SYS}" != "mingwce"; then VLC_ADD_PLUGIN([dmo]) VLC_ADD_PLUGIN([msn]) VLC_ADD_LIBS([dmo],[-lole32 -luuid]) + VLC_ADD_PLUGIN([globalhotkeys]) else VLC_ADD_PLUGIN([win32text]) fi @@ -1430,7 +1517,7 @@ dnl - Others: test should fail AC_CHECK_HEADERS(altivec.h) CPPFLAGS="${CPPFLAGS_save}" - + AS_IF([test "${ac_cv_c_altivec}" != "no"], [ AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, [Define to 1 if C AltiVec extensions are available.]) @@ -1520,14 +1607,18 @@ AC_ARG_ENABLE(debug, test "${enable_debug}" != "yes" && enable_debug="no" AH_TEMPLATE(NDEBUG, [Define to 1 if debug code should NOT be compiled]) -AS_IF([test "x${enable_debug}" = "xno"], [AC_DEFINE(NDEBUG)]) +AS_IF([test "x${enable_debug}" = "xno"], [ + AC_DEFINE(NDEBUG) +], [ + AC_CHECK_HEADERS([valgrind/valgrind.h]) +]) dnl dnl Allow runing as root (usefull for people runing on embedded platforms) dnl AC_ARG_ENABLE(run-as-root, [ --enable-run-as-root allow runing VLC as root (default disabled)]) -AS_IF([test "${enable_run_as_root}" == "yes"],[ +AS_IF([test "${enable_run_as_root}" = "yes"],[ AC_DEFINE(ALLOW_RUN_AS_ROOT, 1, [Define to 1 to allow runing VLC as root (uid 0).]) ]) @@ -1582,7 +1673,7 @@ fi dnl Lua modules AC_ARG_ENABLE(lua, - AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface + AS_HELP_STRING([--enable-lua],[lua playlist, metafetcher and interface plugins (default enabled)])) if test "${enable_lua}" != "no" then @@ -1709,7 +1800,7 @@ dnl dnl Taglibplugin dnl AC_ARG_ENABLE(taglib, - [ --disable-taglib Taglib support (default enabled) ]) + [ --disable-taglib Taglib support (default enabled) ]) AS_IF([test "${enable_taglib}" != "no"],[ PKG_CHECK_MODULES(TAGLIB, taglib, [ AC_DEFINE( HAVE_TAGLIB, 1, [Define if you have taglib plugin built] ) @@ -1728,7 +1819,7 @@ AC_ARG_WITH(,[Input plugins:]) dnl live555 input dnl -if test "${enable_livedotcom}" +if test "${enable_livedotcom}" then AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.) fi @@ -1746,7 +1837,7 @@ if test "${enable_live555}" != "no"; then dnl dnl test for --with-live555-tree dnl - if test "${with_livedotcom_tree}" + if test "${with_livedotcom_tree}" then AC_MSG_WARN(--with-livedotcom-tree is deprecated. Use --with-live555-tree instead.) with_live555_tree="${with_livedotcom_tree}" @@ -1771,7 +1862,7 @@ if test "${enable_live555}" != "no"; then #endif #endif], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. + AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. lternatively you can use --disable-live555 to disable the liveMedia plugin.]) ],[ AC_MSG_RESULT([yes]) @@ -1821,7 +1912,7 @@ lternatively you can use --disable-live555 to disable the liveMedia plugin.]) #endif #endif], [AC_MSG_RESULT([no]) - AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. + AC_MSG_ERROR([Your version of liveMedia is too old: you may get a more recent one from http://www.live555.com/liveMedia. lternatively you can use --disable-live555 to disable the liveMedia plugin.]) ],[ AC_MSG_RESULT([yes]) @@ -2135,7 +2226,7 @@ dnl dnl Windows DirectShow BDA access module dnl AC_ARG_ENABLE(bda, - AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default + AS_HELP_STRING([--enable-bda],[Win32 DirectShow BDA support (default enabled on Win32)])) if test "${enable_bda}" != "no" then @@ -2161,9 +2252,9 @@ then if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin" then test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree]) - AC_MSG_CHECKING(for opencv in ${with_opencv_tree}) - if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \ - -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h + AC_MSG_CHECKING(for opencv in ${with_opencv_tree}) + if test -f ${with_opencv_tree}/cv/include/cv.h -a -f ${with_opencv_tree}/cxcore/include/cxcore.h \ + -a -f ${with_opencv_tree}/cvaux/include/cvaux.h -a -f ${with_opencv_tree}/otherlibs/highgui/highgui.h then AC_MSG_RESULT(yes) VLC_ADD_PLUGIN([opencv_wrapper]) @@ -2173,7 +2264,7 @@ then VLC_ADD_PLUGIN([opencv_example]) VLC_ADD_LIBS([opencv_example],[-L${with_opencv_tree}/lib -lcv -lcxcore -lcvaux -lhighgui]) VLC_ADD_CXXFLAGS([opencv_example],[-I${with_opencv_tree}/cv/include -I${with_opencv_tree}/cxcore/include -I${with_opencv_tree}/cvaux/include -I${with_opencv_tree}/otherlibs/highgui]) - AC_LANG_POP(C++) + AC_LANG_POP(C++) else dnl No opencv could be found, sorry AC_MSG_RESULT(no) @@ -2343,23 +2434,6 @@ then VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include]) fi - if test "${enable_alsa}" != "no" - then - AC_CHECK_HEADER(alsa/asoundlib.h, AC_CHECK_LIB(asound, main, have_v4l2_alsa="true", have_v4l2_alsa="false"),have_v4l2_alsa="false") - fi - - if test "${have_v4l2_alsa}" = "true" - then - CFLAGS="${CFLAGS_save}" - AC_TRY_COMPILE([#define ALSA_PCM_NEW_HW_PARAMS_API - #define ALSA_PCM_NEW_SW_PARAMS_API - #include ], - [snd_pcm_hw_params_get_period_time(0,0,0);], - AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) - VLC_ADD_LDFLAGS([v4l2],[-lasound -lm -ldl]) - AC_DEFINE(HAVE_ALSA, 1, Define if ALSA is present.) - fi - CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}" AC_CHECK_HEADERS(linux/videodev2.h, [ VLC_ADD_PLUGIN([v4l2]) @@ -2396,7 +2470,6 @@ then then AC_DEFINE_UNQUOTED(VIDEODEV2_H_FILE, "${with_videodev2}", [Location of videodev2.h]) fi - AC_CACHE_CHECK([for new linux/videodev2.h], [ac_cv_new_linux_videodev2_h], @@ -2421,7 +2494,7 @@ dnl gnomeVFS access module dnl AC_ARG_ENABLE(gnomevfs, [ --enable-gnomevfs GnomeVFS access module (default disabled)]) -if test "${enable_gnomevfs}" = "yes" +if test "${enable_gnomevfs}" = "yes" then PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0, VLC_ADD_LIBS([access_gnomevfs],[$GNOMEVFS_LIBS]) @@ -2444,7 +2517,7 @@ if test "${enable_libcdio}" != "no" then PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2, have_libcdio=yes - AC_DEFINE(HAVE_LIBCDIO, 1, + AC_DEFINE(HAVE_LIBCDIO, 1, [Define if you have libcdio 0.78.2 or greater installed]), [AC_MSG_WARN(CD Reading and information library not found)]) @@ -2452,7 +2525,7 @@ then then PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22, [have_libvcdinfo=yes - AC_DEFINE(HAVE_VCDINFO, 1, + AC_DEFINE(HAVE_VCDINFO, 1, [Define if you have libvcdinfo 0.7.22 or greater installed])], [AC_MSG_WARN(VCD information library not found)]) fi @@ -2464,10 +2537,10 @@ dnl AC_ARG_ENABLE(cddax, AS_HELP_STRING([--enable-cddax],[audio CD plugin with CD Text and CD paranoia via libcdio (default disabled)])) - + AC_ARG_ENABLE(libcddb, [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)]) - + if test "${enable_cddax}" = "yes" then if test "$have_libcdio" = "yes" @@ -2479,34 +2552,34 @@ then PKG_CHECK_MODULES(LIBCDIO_PARANOIA, libcdio_paranoia >= 0.72, [ VLC_ADD_LIBS([cddax],[$LIBCDIO_CDDA_LIBS $LIBCDIO_CDDA_LIBS $LIBCDIO_PARANOIA_LIBS])], AC_MSG_WARN([CD Paranoia support disabled because no libcdio >= 0.72 found])) - else + else AC_MSG_WARN([cddax plugin disabled because ok libcdio library not found or disabled]) HAVE_CDDAX=no fi if test "$enable_libcddb" != "no"; then PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ - HAVE_LIBCDDB=yes + HAVE_LIBCDDB=yes AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed]) VLC_ADD_LIBS([cddax],[$LIBCDDB_LIBS]) VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS]) ], - [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) + [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) HAVE_LIBCDDB=no]) fi - + fi AC_ARG_ENABLE(vcdx, [ --enable-vcdx VCD with navigation via libvcdinfo (default disabled)]) - + if test "${enable_vcdx}" = "yes" then if test "${have_libvcdinfo}" = "yes" then VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS]) VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) - else + else AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled]) HAVE_VCDX=no fi @@ -2519,12 +2592,12 @@ then if test "$have_libvcdinfo" = "yes" then - AC_DEFINE(HAVE_VCDX, 1, + AC_DEFINE(HAVE_VCDX, 1, [Define for the VCD plugin using libcdio/libvcdinfo]) VLC_ADD_LIBS([vcdx],[$VCDINFO_LIBS]) VLC_ADD_CFLAGS([vcdx],[$VCDINFO_CFLAGS]) VLC_ADD_PLUGIN([vcdx]) - else + else AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found]) HAVE_VCDX=no fi @@ -2533,9 +2606,9 @@ fi dnl dnl Built-in CD-DA and VCD module dnl -AC_ARG_ENABLE(cdda, +AC_ARG_ENABLE(cdda, [ --enable-cdda audio CD via built-in VCD (default enabled)]) - + AC_ARG_ENABLE(vcd, [ --enable-vcd built-in VCD (default enabled)]) @@ -2586,12 +2659,12 @@ then if test "$enable_libcddb" != "no"; then PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.5, [ - HAVE_LIBCDDB=yes + HAVE_LIBCDDB=yes AC_DEFINE(HAVE_LIBCDDB, 1, [Define this if you have libcddb installed]) VLC_ADD_LIBS([cdda],[$LIBCDDB_LIBS]) VLC_ADD_CFLAGS([cdda],[$LIBCDDB_CFLAGS]) ],: - [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) + [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) HAVE_LIBCDDB=no]) fi fi @@ -2604,7 +2677,7 @@ AC_ARG_ENABLE(dvb, if test "${enable_dvb}" != "no" then - AS_IF([test "${have_dvbpsi}" = "yes" ],[ + AS_IF([test "${have_dvbpsi}" = "yes" ],[ AC_ARG_WITH(dvb, [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[]) if test "${with_dvb}" != "no" -a -n "${with_dvb}" @@ -2618,7 +2691,7 @@ then CPPFLAGS="${CPPFLAGS_save}" ],[ AC_MSG_WARN([the dvb access module requires libdvbpsi]) - ]) + ]) fi dnl @@ -2643,14 +2716,6 @@ if test "${enable_screen}" != "no"; then VLC_ADD_PLUGIN([screen]) VLC_ADD_CXXFLAGS([screen],[]) VLC_ADD_LIBS([screen],[-lbe]) - else - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGIN([screen]) - VLC_ADD_LIBS([screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CPPFLAGS([screen],[${X_CFLAGS}]) - ]) - CPPFLAGS="${CPPFLAGS_save}" fi fi @@ -2755,7 +2820,7 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then AC_CHECK_LIB(ebml, main, [ VLC_ADD_PLUGIN([mkv]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) - ]) + ]) ) ], [AC_MSG_RESULT([no]) @@ -2865,6 +2930,26 @@ dnl AC_ARG_WITH(,[Codec plugins:]) +dnl +dnl wmafixed plugin +dnl +AC_ARG_ENABLE(wma-fixed, + [ --enable-wma-fixed libwma-fixed module (default disabled)]) +if test "${enable_wma_fixed}" = "yes" +then + VLC_ADD_PLUGIN([wma_fixed]) +fi + +dnl +dnl shine fixed point mp3 encoder +dnl +AC_ARG_ENABLE(shine, + [ --enable-shine shine mp3 encoding module (default disabled)]) +if test "${enable_shine}" = "yes" +then + VLC_ADD_PLUGIN([shine]) +fi + dnl dnl mad plugin dnl @@ -2927,14 +3012,14 @@ dnl dnl libid3tag support (FIXME!!! doesn't work with new input) dnl AC_ARG_ENABLE( id3tag, -[ --disable-id3tag id3tag metadata reader plugin (default enabled)]) -AS_IF([test "${enable_id3tag}" != "no"], [ +[ --disable-id3tag id3tag metadata reader plugin (default disabled)]) +AS_IF([test "${enable_id3tag}" = "yes"], [ AC_CHECK_HEADERS(id3tag.h, [ - AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LIBS([id3tag],[-lid3tag -lz]) - VLC_ADD_PLUGIN([id3tag]) + AS_IF([test "${have_zlib}" = "yes"],[ + VLC_ADD_LIBS([id3tag],[-lid3tag -lz]) + VLC_ADD_PLUGIN([id3tag]) + ]) ]) - ]) ]) dnl @@ -2995,7 +3080,7 @@ dnl swscale image scaling and conversion plugin dnl AC_ARG_ENABLE(swscale, - AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion + AS_HELP_STRING([--enable-swscale],[libswscale image scaling and conversion (default enabled)])) if test "${enable_swscale}" != "no" then @@ -3024,7 +3109,7 @@ dnl from VLC. dnl AC_ARG_ENABLE(imgresample, - AS_HELP_STRING([--enable-imgresample],[deprecated libavcodec image scaling + AS_HELP_STRING([--enable-imgresample],[deprecated libavcodec image scaling and conversion (default disabled)])) if test "${enable_imgresample}" = "yes" then @@ -3168,7 +3253,7 @@ then VLC_ADD_CPPFLAGS([twolame],[-DLIBTWOLAME_STATIC]) VLC_ADD_LIBS([twolame],[-ltwolame]) ], [ AC_MSG_ERROR([Cannot find libtwolame library...]) ]) - LDFLAGS="${LDFLAGS_save}" + LDFLAGS="${LDFLAGS_save}" CPPFLAGS="${CPPFLAGS_save}" fi fi @@ -3210,13 +3295,6 @@ if test "${enable_realrtsp}" = "yes"; then VLC_ADD_PLUGIN([access_realrtsp]) fi -dnl -dnl MP4 module -dnl -AC_CHECK_HEADERS(zlib.h, [ - VLC_ADD_LIBS([mp4 skins2 sap mkv gme],[-lz]) -] ) - AC_ARG_ENABLE(libsysfs, [ --enable-libsysfs Get user key from firewire connected iPod via libsysfs (default enabled)]) @@ -3326,7 +3404,7 @@ AS_IF([test "x${with_dts_tree}" != "x"], [ ]) AC_ARG_ENABLE(dca, - AS_HELP_STRING([--enable-dca],[DTS Coherent Acoustics support with libdca + AS_HELP_STRING([--enable-dca],[DTS Coherent Acoustics support with libdca (default enabled)])) AS_IF([test "${enable_dca}" != "no"], [ AC_ARG_WITH(dca-tree, @@ -3435,11 +3513,11 @@ then AC_MSG_ERROR([cannot find ${real_libmpeg2_tree}/libmpeg2/.libs/libmpeg2.a, make sure you compiled libmpeg2 in ${with_libmpeg2_tree}]) fi ],[ - PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[ + PKG_CHECK_MODULES(LIBMPEG2,[libmpeg2 > 0.3.2],[ VLC_ADD_PLUGIN([libmpeg2]) VLC_ADD_LIBS([libmpeg2], $LIBMPEG2_LIBS) VLC_ADD_CFLAGS([libmpeg2], $LIBMPEG2_CFLAGS) - ], + ], AC_MSG_WARN([Could not find libmpeg2 on your system: you may get it from http://libmpeg2.sf.net/ . Alternatively you can use --disable-libmpeg2 to disable the libmpeg2 plugin.])) ]) fi @@ -3465,7 +3543,7 @@ then fi if test -f "${real_vorbis_tree}/lib/.libs/libvorbis.a" then - dnl Use a custom vorbis + dnl Use a custom vorbis AC_MSG_RESULT(${real_vorbis_tree}/lib/.libs/libvorbis.a) VLC_ADD_PLUGIN([vorbis]) VLC_ADD_LIBS([vorbis],[${real_vorbis_tree}/lib/.libs/libvorbis.a ${real_vorbis_tree}/lib/.libs/libvorbisenc.a]) @@ -3667,6 +3745,9 @@ if test "${enable_x264}" != "no"; then VLC_ADD_PLUGIN([x264]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) + if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) + fi ],[ AC_MSG_ERROR([the specified tree hasn't been compiled]) ]) @@ -3680,6 +3761,9 @@ if test "${enable_x264}" != "no"; then VLC_ADD_PLUGIN([x264]) VLC_ADD_LDFLAGS([x264],[${X264_LIBS}]) VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}]) + if echo ${X264_LIBS} |grep -q 'pthreadGC2'; then + VLC_ADD_CFLAGS([x264], [-DPTW32_STATIC_LIB]) + fi ],[ if test "${enable_x264}" = "yes"; then AC_MSG_ERROR([Could not find libx264 on your system: you may get it from http://www.videolan.org/x264.html]) @@ -3713,10 +3797,10 @@ dnl telx module dnl uncompatible dnl AC_ARG_ENABLE(zvbi, - AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with + AS_HELP_STRING([--enable-zvbi],[VBI (inc. Teletext) decoding support with libzvbi (default enabled)])) AC_ARG_ENABLE(telx, - AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with + AS_HELP_STRING([--enable-telx],[Teletext decoding module (conflicting with zvbi) (default enabled if zvbi is absent)])) AS_IF( [test "${enable_zvbi}" != "no"],[ @@ -3726,15 +3810,15 @@ AS_IF( [test "${enable_zvbi}" != "no"],[ VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS]) VLC_ADD_CFLAGS([zvbi],[$ZVBI_CFLAGS]) VLC_ADD_PLUGIN([zvbi]) - AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) + AC_DEFINE(ZVBI_COMPILED, 1, [Define if the zvbi module is built]) AS_IF( [test "${enable_telx}" = "yes"],[ - AC_MSG_WARN([The zvbi and telx modules are uncompatibles. + AC_MSG_WARN([The zvbi and telx modules are uncompatibles. Using zvbi.]) ]) ],[ AC_MSG_WARN(ZVBI library not found. Enabling the telx module instead) ]) - ]) + ]) AS_IF( [test "${enable_telx}" != "no" ],[ VLC_ADD_PLUGIN([telx]) ]) @@ -3841,15 +3925,66 @@ AS_IF([test "${enable_kate}" != "no"], [ ]) +dnl +dnl tiger decoder plugin +dnl +AC_ARG_ENABLE(tiger, +[ --enable-tiger Tiger rendering library for Kate streams (default enabled)]) +AS_IF([test "${enable_tiger}" != "no"], [ + PKG_CHECK_MODULES(TIGER,[tiger >= 0.3.1], [ + AC_DEFINE(HAVE_TIGER, 1, [Define if libtiger is available.]) + VLC_ADD_CFLAGS([kate],[$TIGER_CFLAGS]) + VLC_ADD_LIBS([kate],[$TIGER_LIBS]) ],[ + AS_IF([test "x${enable_tiger}" != "x"], [ + AC_MSG_ERROR([libtiger does not appear to be installed on your system.]) + ]) + ]) +]) + + dnl dnl Video plugins dnl AC_ARG_WITH(,[Video plugins:]) +dnl +dnl Xlib +dnl + +AC_PATH_XTRA() +AC_ARG_ENABLE(x11, + [ --enable-x11 X11 support (default enabled)],, [ + AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [ + enable_x11="yes" + ], [ + enable_x11="no" + ]) +]) + +CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" +AC_CHECK_HEADERS(X11/Xlib.h, [ + VLC_ADD_PLUGIN([x11_screen]) + VLC_ADD_CPPFLAGS([x11_screen],[${X_CFLAGS}]) + VLC_ADD_LIBS([x11_screen],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + + VLC_ADD_PLUGIN([panoramix]) + VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) + + VLC_ADD_PLUGIN([globalhotkeys]) + VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11]) + VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}]) + + AC_CHECK_LIB(Xext, XShmAttach, [ + VLC_ADD_PLUGIN([x11]) + VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) + VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) + ]) +]) + dnl Check for DPMS -if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" +AS_IF([test "${enable_x11}" != "no"], [ AC_CHECK_HEADERS(X11/extensions/dpms.h, [ AC_MSG_CHECKING(for DPMSInfo in X11/extensions/dpms.h) AC_EGREP_HEADER(DPMSInfo,X11/extensions/dpms.h,[ @@ -3862,42 +3997,17 @@ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then ],,[ #include ]) - CPPFLAGS="${CPPFLAGS_save}" -fi - -dnl -dnl X11 module -dnl (enabled by default except on win32) -dnl -AC_ARG_ENABLE(x11, - [ --enable-x11 X11 support (default enabled)]) -if test "${enable_x11}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_x11}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" - AC_CHECK_HEADERS(X11/Xlib.h, [ - VLC_ADD_PLUGIN([panoramix]) - VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11]) - VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}]) - AC_CHECK_LIB(Xext, XShmAttach, [ - VLC_ADD_PLUGIN([x11]) - VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext]) - VLC_ADD_CPPFLAGS([x11],[${X_CFLAGS}]) - ]) - ]) - CPPFLAGS="${CPPFLAGS_save}" -fi +]) dnl dnl XVideo module dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(xvideo, - [ --enable-xvideo XVideo support (default enabled)]) -if test "${enable_xvideo}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_xvideo}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" + [ --enable-xvideo XVideo support (default enabled)],, [ + enable_xvideo="$enable_x11" +]) +AS_IF([test "${enable_xvideo}" != "no"], [ AC_CHECK_HEADERS(X11/extensions/Xv.h, [ CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_LIB(Xv,XvPutImage,[ @@ -3906,20 +4016,18 @@ if test "${enable_xvideo}" != "no" && VLC_ADD_LIBS([xvideo],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXv]) ]) CFLAGS="${CFLAGS_save}" - ] - CPPFLAGS="${CPPFLAGS_save}") -fi + ]) +]) dnl dnl GLX module dnl (enabled by default except on win32) dnl AC_ARG_ENABLE(glx, - [ --enable-glx X11 OpenGL (GLX) support (default enabled)]) -if test "${enable_glx}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_glx}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" + [ --enable-glx X11 OpenGL (GLX) support (default enabled)],, [ + enable_glx="$enable_x11" +]) +AS_IF([test "${enable_glx}" != "no"], [ AC_CHECK_HEADERS(X11/Xlib.h GL/glu.h GL/glx.h) AC_COMPILE_IFELSE(AC_LANG_PROGRAM( [[#if !defined(HAVE_X11_XLIB_H) || !defined(HAVE_GL_GLU_H) || !defined(HAVE_GL_GLX_H) @@ -3930,37 +4038,33 @@ if test "${enable_glx}" != "no" && VLC_ADD_LIBS([glx],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lGL -lGLU]) VLC_ADD_CPPFLAGS([glx],[${X_CFLAGS}]) ],[AC_MSG_ERROR([Please install GL development package. Alternatively you can also configure with --disable-glx.])]) - CPPFLAGS="${CPPFLAGS_save}" -fi +]) dnl dnl XVMC module dnl (disabled by default except on win32) dnl AC_ARG_ENABLE(xvmc, - [ --enable-xvmc XVMC support (default disabled)]) -if test "${enable_xvmc}" = "yes" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_xvmc}" = "yes"); then - CPPFLAGS="${CPPFLAGS_save} ${X_FLAGS}" + [ --enable-xvmc XVMC support (default disabled)],, [ + enable_xvmc="no" +]) +AS_IF([test "${enable_xvmc}" != "no"], [ AC_CHECK_HEADERS(X11/extensions/vldXvMC.h, [ VLC_ADD_PLUGIN([xvmc]) VLC_ADD_LIBS([xvmc],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext -lXvMCW -lXv -lXinerama]) VLC_ADD_CPPFLAGS([xvmc],[${X_CFLAGS}]) ]) - CPPFLAGS="${CPPFLAGS_save}" -fi +]) dnl dnl Check for the Xinerama extension dnl AC_ARG_ENABLE(xinerama, - [ --enable-xinerama Xinerama support (default enabled)]) -if test "${enable_xvideo}" != "no" && test "${enable_xinerama}" != "no" && - (test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" || - test "${enable_xvideo}" = "yes"); then + [ --enable-xinerama Xinerama support (default enabled)],, [ + enable_xinerama="$enable_xvideo" +]) +AS_IF([test "$enable_xinerama" != "no"], [ ac_cv_have_xinerama="no" - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[ AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[ @@ -3980,15 +4084,11 @@ if test "${enable_xvideo}" != "no" && test "${enable_xinerama}" != "no" && if test "${ac_cv_have_xinerama}" = "yes"; then AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed]) fi - CFLAGS="${CFLAGS_save}" - CPPFLAGS="${CPPFLAGS_save}" dnl dnl Check for XF86VidMode extension dnl ac_cv_have_xf86vidmode="no" - CPPFLAGS="${CPPFLAGS_save} ${X_CFLAGS}" - CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext" AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[ AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[ VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic]) @@ -4014,9 +4114,11 @@ dnl [AC_DEFINE(HAVE_XF86VIDMODE, 1, [Define this if you have libXxf86vm installed]) ]) CFLAGS="${CFLAGS_save}" - CPPFLAGS="${CPPFLAGS_save}" +]) + +dnl End of Xlib tests +CPPFLAGS="${CPPFLAGS_save}" -fi dnl dnl OpenGL module @@ -4233,7 +4335,7 @@ AC_ARG_ENABLE(svg, [ --enable-svg SVG support (default disabled)]) if test "${enable_svg}" = "yes" then - PKG_CHECK_MODULES(SVG, + PKG_CHECK_MODULES(SVG, librsvg-2.0 >= 2.9.0, [ VLC_ADD_LIBS([svg],[$SVG_LIBS]) @@ -4407,7 +4509,7 @@ dnl TODO: support for static linking dnl AC_ARG_ENABLE(directfb, [ --enable-directfb DirectFB support (default disabled)]) -AC_ARG_WITH(directfb, +AC_ARG_WITH(directfb, [ --with-directfb=PATH path to DirectFB headers and libraries]) if test "${enable_directfb}" = "yes"; then @@ -4443,14 +4545,14 @@ if test "${enable_directfb}" = "yes"; then LIBS_mydirectfb="${LIBS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread" CPPFLAGS_mydirectfb="${CPPFLAGS_new}" fi - else + else dnl Look for directfb-config AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH}) if test "${DIRECTFB_CONFIG}" != "no"; then CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`" LIBS_mydirectfb="`${DIRECTFB_CONFIG} --libs`" have_directfb="true" - else + else dnl Trying with pkg-config PKG_CHECK_MODULES(DIRECTFB, directfb, [ CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}" @@ -4463,11 +4565,11 @@ if test "${enable_directfb}" = "yes"; then VLC_ADD_PLUGIN([directfb]) VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}]) VLC_ADD_LIBS([directfb],[${LIBS_mydirectfb}]) - else + else AC_MSG_ERROR([cannot find directfb headers and/or libraries ]) fi fi - + dnl @@ -4550,6 +4652,8 @@ if test "${enable_wingdi}" != "no"; then if test "${SYS}" = "mingwce"; then VLC_ADD_PLUGIN([wingdi]) VLC_ADD_PLUGIN([wingapi]) + VLC_ADD_LIBS([wingdi],[-laygshell]) + VLC_ADD_LIBS([wingapi],[-laygshell]) fi fi @@ -4571,6 +4675,7 @@ if test "${enable_oss}" != "no" && then AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h, [ VLC_ADD_PLUGIN([oss]) + VLC_ADD_PLUGIN([access_oss]) AC_CHECK_LIB(ossaudio,main,VLC_ADD_LIBS([oss],[-lossaudio])) ]) fi @@ -4623,6 +4728,8 @@ then AC_DEFINE(HAVE_ALSA_NEW_API, 1, Define if ALSA is at least rc4)) VLC_ADD_PLUGIN([alsa]) VLC_ADD_LIBS([alsa],[-lasound -lm -ldl]) + VLC_ADD_PLUGIN([access_alsa]) + VLC_ADD_LIBS([access_alsa],[-lasound -lm -ldl]) else if test "${enable_alsa}" = "yes"; then AC_MSG_ERROR([Could not find ALSA development headers]) @@ -4653,7 +4760,7 @@ AC_ARG_ENABLE(macosx-audio, if test "${enable_macosx-audio}" != "no" && (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes") then - AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, + AC_CHECK_HEADERS(CoreAudio/CoreAudio.h, [ VLC_ADD_PLUGIN([auhal]) VLC_ADD_LDFLAGS([auhal],[-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,Carbon]) ], [ AC_MSG_ERROR([cannot find CoreAudio headers]) ]) @@ -4715,7 +4822,7 @@ AC_ARG_ENABLE(cyberlink, CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_cyberlink}" AC_CHECK_HEADERS([cybergarage/upnp/MediaServer.h], [ VLC_ADD_CXXFLAGS([upnp_cc], [${CPPFLAGS_cyberlink}]) - VLC_ADD_PLUGIN([upnp_cc]) + VLC_ADD_PLUGIN([upnp_cc]) ],[ AC_MSG_ERROR([cannot find CyberLink for C++ headers]) ]) @@ -5012,7 +5119,7 @@ then VLC_ADD_PLUGIN([qtcapture]) VLC_ADD_PLUGIN([macosx]) VLC_ADD_PLUGIN([minimal_macosx]) - + ORIGCFLAGS=$CFLAGS CFLAGS="$CFLAGS -x objective-c" AC_TRY_COMPILE([#import ],, @@ -5195,7 +5302,7 @@ dnl AtmoLight (homebrew AmbiLight) dnl if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then AC_ARG_ENABLE(atmo, -AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) +AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew philips ambilight) (default enabled)])) if test "${enable_atmo}" != "no"; then AC_LANG_PUSH(C++) @@ -5242,7 +5349,7 @@ dnl dnl libgcrypt dnl AC_ARG_ENABLE(libgcrypt, - [ --enable-libgcrypt libgcrypts support (default enabled)]) + [ --disable-libgcrypt libgcrypts support (default enabled)]) AS_IF([test "${enable_libgcrypt}" != "no"], [ AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"]) ]) @@ -5330,6 +5437,7 @@ then AC_DEFINE([UPDATE_CHECK], 1, [Define if you want to use the VLC update mechanism]) fi + dnl dnl Endianness check dnl @@ -5346,19 +5454,19 @@ dnl DLL loader copied from MPlayer copied from somewhere else (WINE ?) dnl loader=false AC_ARG_ENABLE(loader, - AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms + AS_HELP_STRING([--enable-loader],[build DLL loader for ELF i386 platforms (default disabled)])) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AS_IF([test "${enable_loader}" = "yes"], [ VLC_ADD_PLUGIN([dmo]) - VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader]) - VLC_ADD_LIBS([dmo],[../../../libs/loader/libloader.la -lpthread]) - VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader]) - VLC_ADD_LIBS([quicktime],[../../libs/loader/libloader.la -lpthread]) - VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER]) - VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la]) - VLC_ADD_CPPFLAGS([realvideo],[-I../../@top_srcdir@/libs/loader -DLOADER]) - VLC_ADD_LIBS([realvideo],[../../libs/loader/libloader.la]) + VLC_ADD_CPPFLAGS([dmo],[-I\\\${top_srcdir}/libs/loader]) + VLC_ADD_LIBS([dmo],[\\\${top_builddir}/libs/loader/libloader.la -lpthread]) + VLC_ADD_CPPFLAGS([quicktime],[-I\\\${top_srcdir}/libs/loader]) + VLC_ADD_LIBS([quicktime],[\\\${top_builddir}/libs/loader/libloader.la -lpthread]) + VLC_ADD_CPPFLAGS([realaudio],[-I\\\${top_srcdir}/libs/loader -DLOADER]) + VLC_ADD_LIBS([realaudio],[\\\${top_builddir}/libs/loader/libloader.la]) + VLC_ADD_CPPFLAGS([realvideo],[-I\\\${top_srcdir}/libs/loader -DLOADER]) + VLC_ADD_LIBS([realvideo],[\\\${top_builddir}/libs/loader/libloader.la]) ]) AC_ARG_WITH(,[Components:]) @@ -5375,7 +5483,7 @@ dnl Microsoft ActiveX support dnl activex=false AC_ARG_ENABLE(activex, - AS_HELP_STRING([--enable-activex],[build a vlc-based ActiveX control + AS_HELP_STRING([--enable-activex],[build a vlc-based ActiveX control (default enabled on Win32)])) AC_ARG_WITH(wine-sdk-path, [ --with-wine-sdk-path=PATH path to wine sdk]) @@ -5392,11 +5500,11 @@ then WIDL=no fi AC_LANG_PUSH(C++) - AC_CHECK_HEADERS(ole2.h, + AC_CHECK_HEADERS(ole2.h, [AC_CHECK_HEADERS(olectl.h, [ VLC_ADD_CPPFLAGS([activex],[-DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_]) VLC_ADD_CXXFLAGS([activex],[-fno-exceptions]) - VLC_ADD_LIBS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) + VLC_ADD_LIBS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) AC_CHECK_HEADERS(objsafe.h, VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),, [ @@ -5433,12 +5541,12 @@ AC_ARG_WITH(mozilla-sdk-path, AC_ARG_WITH(mozilla-pkg, [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.]) AC_LANG_PUSH(C++) -if test "${enable_mozilla}" = "yes" +if test "${enable_mozilla}" = "yes" then AS_IF([test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"], [ dnl pkg-config - dnl As we want to do a loop due to the number of name possible for the .pc + dnl As we want to do a loop due to the number of name possible for the .pc dnl we can't use the pkg-config macros. AC_ARG_VAR([MOZILLA_CFLAGS], [C compiler flags for Mozilla, overriding pkg-config]) @@ -5463,10 +5571,11 @@ then fi done fi - fi + fi AS_IF( [test $found = 1],[ CPPFLAGS="${CPPFLAGS_save} ${MOZILLA_CFLAGS}" MOZILLA_REQUIRED_HEADERS=1 + AC_CHECK_HEADERS([npfunctions.h]) AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0) AC_CHECK_HEADERS(npruntime.h,,MOZILLA_REQUIRED_HEADERS=0, [#if HAVE_NPAPI_H @@ -5496,8 +5605,8 @@ then CPPFLAGS="${CPPFLAGS_save}" ], [ - AC_PATH_PROGS(MOZILLA_CONFIG, - [mozilla-config seamonkey-config xulrunner-config], + AC_PATH_PROGS(MOZILLA_CONFIG, + [mozilla-config seamonkey-config xulrunner-config], AC_MSG_ERROR([Please install the Mozilla development tools. mozilla-config was not found.]) ) ] @@ -5585,7 +5694,7 @@ then real_mozilla_sdk="`${CYGPATH} -w ${real_mozilla_sdk}`" fi CPPFLAGS="${CPPFLAGS_save}" - ]) + ]) fi AC_LANG_POP(C++) AM_CONDITIONAL(BUILD_MOZILLA,${mozilla}) @@ -5680,18 +5789,9 @@ AS_IF([test "${ac_cv_have_plugins}" = "no"], [ plugin_support=no ]) -AS_IF([test "${enable_shared}" = "no"], [ - plugin_support=no -]) - AS_IF([test "${plugin_support}" != "no"], [ - AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins) + AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported]) ]) -AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"]) - -dnl Temporary(?) hack for plugins/builtins transition -dnl VLC_ADD_PLUGIN([${BUILTINS}]) -dnl BUILTINS="" dnl dnl Pic and shared libvlc stuff @@ -5720,17 +5820,17 @@ AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_REVISION) AC_SUBST(COPYRIGHT_YEARS) -AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) +AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure]) if test "${build_os}" = "cygwin" then AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure]) else AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname -s`", [host which ran configure]) fi -AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) -AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) +AC_DEFINE_UNQUOTED(VLC_COMPILE_DOMAIN, "`dnsdomainname 2>/dev/null || domainname 2>/dev/null || echo unknown`", [domain of the host which ran configure]) +AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler]) dnl Win32 need s a numerical version_extra. -case $( echo ${VERSION_EXTRA}|wc -m ) in +case $( echo ${VERSION_EXTRA}|wc -m ) in "1") VERSION_EXTRA_RC="0";; "2") VERSION_EXTRA_RC=$( echo ${VERSION_EXTRA}|tr "abcdefghi" "123456789") ;; *) VERSION_EXTRA_RC="99" @@ -5739,7 +5839,7 @@ AC_SUBST(VERSION_EXTRA_RC) dnl dnl Handle substvars that use $(top_srcdir) dnl -VLC_CONFIG="top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" +VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config" AC_SUBST(VLC_CONFIG) CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}" @@ -5750,7 +5850,7 @@ VLC_RESTORE_FLAGS dnl dnl Sort the modules list -dnl +dnl PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs ) dnl @@ -5786,7 +5886,6 @@ AC_CONFIG_FILES([ extras/package/macosx/Resources/English.lproj/InfoPlist.strings extras/package/macosx/plugin/Info.plist extras/package/macosx/plugin/InstallerInfo.plist - extras/package/macosx/plugin/English.lproj/InfoPlist.strings Makefile projects/activex/Makefile projects/activex/axvlc.inf @@ -5794,12 +5893,14 @@ AC_CONFIG_FILES([ extras/package/ipkg/Makefile libs/loader/Makefile libs/srtp/Makefile + libs/unzip/Makefile modules/Makefile projects/mozilla/Makefile m4/Makefile po/Makefile.in projects/activex/axvlc_rc.rc projects/mozilla/npvlc_rc.rc + projects/mozilla/vlc.r share/Makefile share/vlc_win32_rc.rc share/libvlc_win32_rc.rc @@ -5807,10 +5908,8 @@ AC_CONFIG_FILES([ src/test/Makefile bin/Makefile test/Makefile -]) - -AC_CONFIG_FILES([ modules/access/Makefile + modules/access/bd/Makefile modules/access/bda/Makefile modules/access/dshow/Makefile modules/access/dvb/Makefile @@ -5819,10 +5918,10 @@ AC_CONFIG_FILES([ modules/access/rtp/Makefile modules/access/rtsp/Makefile modules/access/rtmp/Makefile - modules/access/v4l2/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile modules/access/screen/Makefile + modules/access/zip/Makefile modules/access_output/Makefile modules/audio_filter/Makefile modules/audio_filter/channel_mixer/Makefile @@ -5835,11 +5934,14 @@ AC_CONFIG_FILES([ modules/codec/avcodec/Makefile modules/codec/cmml/Makefile modules/codec/dmo/Makefile + modules/codec/shine/Makefile modules/codec/subtitles/Makefile modules/codec/spudec/Makefile + modules/codec/wmafixed/Makefile modules/codec/xvmc/Makefile modules/control/Makefile modules/control/http/Makefile + modules/control/globalhotkeys/Makefile modules/demux/Makefile modules/demux/asf/Makefile modules/demux/avformat/Makefile