dnl Autoconf settings for vlc
-AC_COPYRIGHT([Copyright 2002-2009 the VideoLAN team])
+AC_COPYRIGHT([Copyright 2002-2010 the VideoLAN team])
AC_INIT(vlc, 1.1.0-git)
VERSION_MAJOR="1"
AC_SUBST(PKGDIR)
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
-CODENAME="Yellow Bastard"
-COPYRIGHT_YEARS="1996-2009"
+CODENAME="The Luggage"
+COPYRIGHT_YEARS="1996-2010"
AC_PREREQ(2.59c)
AC_CONFIG_SRCDIR(src/libvlc.c)
vlclibdir="\${libdir}/\${PKGDIR}"
AC_SUBST(vlclibdir)
-dnl
-dnl Deprecated options
-dnl to notify packagers that stuff has changed
-dnl
-AC_ARG_ENABLE(python-bindings,
- [ --enable-python-bindings Always fails for historical reasons)],,
- [enable_python_bindings="no"])
-AS_IF([test "${enable_python_bindings}" != "no"], [
- AC_MSG_ERROR([Python bindings are now built from a separate source package])
-])
-
-AC_ARG_ENABLE(java-bindings,
- [ --enable-java-bindings Always fails for historical reasons],,
- [enable_java_bindings="no"])
-AS_IF([test "${enable_java_bindings}" != "no"], [
- AC_MSG_ERROR([Java bindings are now built from a separate source package])
-])
-
dnl
dnl Save *FLAGS
dnl
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
AS_IF([test -d ${CONTRIB_DIR}/lib],[
AC_MSG_RESULT([yes])
+ AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
with_cyberlink_tree=${CONTRIB_DIR}/src/clinkcc
fi
- if test ".`uname -s`" = ".Darwin"; then
+ if test "${SYS}" = "darwin"; then
export LD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${CONTRIB_DIR}/lib:$DYLD_LIBRARY_PATH
- elif test ".`uname -s`" = ".BeOS"; then
+ elif test "${SYS}" = "beos"; then
export LIBRARY_PATH=${CONTRIB_DIR}/lib:$LIBRARY_PATH
export BELIBRARIES=${CONTRIB_DIR}/lib:$BELIBRARIES
fi
bsdi*)
SYS=bsdi
CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
- VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx cddax],[-ldvd])
+ VLC_ADD_LIBS([dvd dvdcss vcd cdda vcdx],[-ldvd])
;;
*bsd*)
SYS="${host_os}"
CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}"
LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}"
- VLC_ADD_LDFLAGS([mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LDFLAGS([mkv mp4], [-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LDFLAGS([vlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LDFLAGS([libvlc],[-Wl,-undefined,dynamic_lookup])
+ VLC_ADD_LDFLAGS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LDFLAGS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
VLC_ADD_LDFLAGS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
VLC_ADD_LDFLAGS([libvlccore],[-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)]))
if test "x${enable_macosx_defaults}" != "xno"
echo " Assuming --enable-theora"
enable_shout="yes"
echo " Assuming --enable-shout"
- enable_cddax="yes"
- echo " Assuming --enable-cddax"
enable_vcdx="yes"
echo " Assuming --enable-vcdx"
enable_caca="yes"
LD="${LD} -syslibroot ${with_macosx_sdk}"
fi
AC_ARG_WITH(macosx-version-min,
- [ --with-macosx-version-min=VERSION compile for MacOSX VERSION and above])
+ [ --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}"
fi
;;
darwin9*)
- if (test ".`uname -p`" = ".i386"); then
+ if test "${host_cpu}" = "i386"; then
dnl Due to a ld(64) bug in 10.5 we cannot use our mmx code
dnl without hacking it a lot, we disable mmx and sse.
dnl (that bug is about ld being unable to handle
# add ws2_32 for closesocket, select, recv
VLC_ADD_LIBS([libvlccore],[-lws2_32 -lnetapi32 -lwinmm])
VLC_ADD_LDFLAGS([vlc],[-mwindows])
- VLC_ADD_LIBS([activex mozilla],[-lgdi32])
- VLC_ADD_LIBS([cdda vcdx cddax sdl_image aout_sdl vout_sdl],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp http stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a],[-lws2_32])
- VLC_ADD_LIBS([access_file], [-lshlwapi])
+ VLC_ADD_LIBS([activex mozilla win32text],[-lgdi32])
+ VLC_ADD_LIBS([cdda vcdx sdl_image aout_sdl vout_sdl],[-lwinmm])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_shout access_output_rtmp sap slp oldhttp stream_out_standard stream_out_rtp stream_out_raop vod_rtsp access_realrtsp rtp oldtelnet oldrc netsync gnutls growl_udp flac ts audioscrobbler lua remoteosd zvbi audiobargraph_a netsync],[-lws2_32])
+ VLC_ADD_LIBS([filesystem], [-lshlwapi])
dnl
dnl DEP and ASLR options
dnl
AC_ARG_ENABLE(peflags,
- [ --enable-peflags peflags use (default enabled)])
+ [ --enable-peflags peflags use (default enabled on Windows)])
if test "${enable_peflags}" != "no"
then
AC_CHECK_TOOL(PEFLAGS, peflags, :)
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
- VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap http netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts telnet audiobargraph_a],[-lws2])
+ VLC_ADD_LIBS([libvlccore access_http access_mms access_udp access_tcp access_ftp access_rtmp access_output_udp access_output_rtmp sap oldhttp netsync audioscrobbler growl rtp stream_out_rtp remoteosd ts oldtelnet audiobargraph_a netsync],[-lws2])
VLC_ADD_LIBS([libvlccore],[-lmmtimer])
fi
;;
CXXFLAGS_save="${CXXFLAGS_save} -Wno-multichar"; CXXFLAGS="${CXXFLAGS_save}"
VLC_ADD_CXXFLAGS([beos],[])
VLC_ADD_LIBS([vlc libvlccore logger],[-lbe])
- VLC_ADD_LIBS([beos],[-lbe -lmedia -ltranslation -ltracker -lgame])
VLC_ADD_LIBS([dvdnav dvdread],[-ldl])
- VLC_ADD_LIBS([access_file],[-lpoll])
+ VLC_ADD_LIBS([filesystem],[-lpoll])
LDFLAGS_save="${LDFLAGS_save} -lintl"; LDFLAGS="${LDFLAGS_save}"
dnl Check for BONE
if test -f /boot/beos/system/lib/libbind.so; then
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
+ VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lbind -lsocket])
else
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlccore growl_udp],[-lnet])
- fi
-
- dnl Ugly check for Zeta
- if test -f /boot/beos/system/lib/libzeta.so; then
- VLC_ADD_LIBS([beos],[-lzeta])
+ VLC_ADD_LIBS([filesystem access_ftp access_mms access_output_udp oldtelnet netsync sap libvlccore growl_udp],[-lnet])
fi
;;
*)
need_libc=false
dnl Check for usual libc functions
-AC_CHECK_FUNCS([gettimeofday isatty sigrelse getpwuid_r memalign posix_memalign if_nametoindex getenv putenv setenv ctime_r daemon fork lstat posix_fadvise posix_madvise uselocale])
-AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll vasprintf swab tdestroy])
-AC_CHECK_FUNCS([stricmp strnicmp])
+AC_CHECK_FUNCS([ctime_r daemon fcntl fdopendir fork getenv getpwuid_r gettimeofday isatty lstat memalign posix_fadvise posix_madvise posix_memalign putenv setenv setlocale stricmp strnicmp tdestroy uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab vasprintf])
AC_CHECK_FUNCS(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
])
dnl Check for non-standard system calls
-AC_CHECK_FUNCS([vmsplice eventfd fstatfs accept4])
+AC_CHECK_FUNCS([accept4 eventfd fstatfs vmsplice])
AH_BOTTOM([#include <vlc_fixups.h>])
AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGIN([access_mmap])])
-dnl Check for setlocal and langinfo
-AC_CHECK_FUNCS(setlocale)
-AC_CHECK_HEADERS(langinfo.h)
-AC_CHECK_FUNCS(nl_langinfo)
-
-AC_CACHE_CHECK([for nl_langinfo and CODESET], ac_cv_langinfo_codeset,
- [AC_TRY_LINK([#include <langinfo.h>],
- [char* cs = nl_langinfo(CODESET);],
- ac_cv_langinfo_codeset=yes,
- ac_cv_langinfo_codeset=no)
- ])
-if test ${ac_cv_langinfo_codeset} = yes; then
- AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
- [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
-fi
-
SOCKET_LIBS=""
AC_CHECK_FUNCS(connect,,[
AC_CHECK_LIB(socket,connect,[
- VLC_ADD_LIBS([libvlccore cdda cddax],-lsocket)
+ VLC_ADD_LIBS([libvlccore cdda],-lsocket)
SOCKET_LIBS="-lsocket"
])
])
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd],[-lsocket])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_rtmp sap access_output_udp access_output_rtmp stream_out_standard growl_udp remoteosd netsync],[-lsocket])
])
])
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger],[-lm])
])
AC_CHECK_LIB(m,pow,[
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realvideo opengl],[-lm])
])
AC_CHECK_LIB(m,sqrt,[
- VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract],[-lm])
+ VLC_ADD_LIBS([headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball],[-lm])
])
AC_CHECK_LIB(m,ceil,[
VLC_ADD_LIBS([access_imem hotkeys mosaic swscale_omap],[-lm])
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realaudio realvideo lua],[-ldl]),
+ VLC_ADD_LIBS([libvlccore realvideo lua],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld]))))
THREAD_LIB=""
fi
-VLC_ADD_LIBS([libvlccore libvlc plugin],[${THREAD_LIB}])
+VLC_ADD_LIBS([libvlccore libvlc vlc plugin],[${THREAD_LIB}])
AC_CHECK_LIB(rt, clock_nanosleep, [
VLC_ADD_LIBS([libvlccore],[-lrt])
dnl Check for headers
AC_CHECK_HEADERS(getopt.h strings.h locale.h xlocale.h)
-AC_CHECK_HEADERS(fcntl.h sys/types.h sys/time.h sys/times.h sys/ioctl.h sys/stat.h sys/mount.h)
+AC_CHECK_HEADERS(fcntl.h sys/time.h sys/ioctl.h sys/stat.h sys/mount.h)
AC_CHECK_HEADERS([arpa/inet.h netinet/in.h netinet/udplite.h sys/eventfd.h])
AC_CHECK_HEADERS([net/if.h], [], [],
[
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
-AC_HEADER_TIME
-
dnl LP64 adn LLP64 architectures had better define ssize_t by themselves...
AH_TEMPLATE(ssize_t, [Define to `int' if <stddef.h> does not define.])
AC_CHECK_TYPE(ssize_t,, [
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])
+ VLC_ADD_PLUGIN([unzip zip])
fi
AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
;;
esac
-dnl build the qte plugin ?
-NEED_QTE_MAIN=no
-
dnl Check for ntohl, etc.
AC_CACHE_CHECK([for ntohl in sys/param.h],
[ac_cv_c_ntohl_sys_param_h],
dnl
dnl default modules
dnl
-dnl Video filters:
-VLC_ADD_PLUGIN([deinterlace])
-VLC_ADD_PLUGIN([yuvp])
-VLC_ADD_PLUGIN([invert])
-VLC_ADD_PLUGIN([mirror])
-VLC_ADD_PLUGIN([adjust])
-VLC_ADD_PLUGIN([transform])
-VLC_ADD_PLUGIN([wave])
-VLC_ADD_PLUGIN([ripple])
-VLC_ADD_PLUGIN([psychedelic])
-VLC_ADD_PLUGIN([gradient])
-VLC_ADD_PLUGIN([motionblur])
-VLC_ADD_PLUGIN([rv32])
-VLC_ADD_PLUGIN([rotate])
-VLC_ADD_PLUGIN([noise])
-VLC_ADD_PLUGIN([grain])
-VLC_ADD_PLUGIN([extract])
-VLC_ADD_PLUGIN([sharpen])
-VLC_ADD_PLUGIN([croppadd])
-VLC_ADD_PLUGIN([canvas])
-VLC_ADD_PLUGIN([blendbench])
-VLC_ADD_PLUGIN([blend])
-VLC_ADD_PLUGIN([scale])
-VLC_ADD_PLUGIN([vmem])
-VLC_ADD_PLUGIN([logo])
-VLC_ADD_PLUGIN([audiobargraph_v])
-VLC_ADD_PLUGIN([magnify])
-VLC_ADD_PLUGIN([puzzle])
-VLC_ADD_PLUGIN([colorthres])
-VLC_ADD_PLUGIN([scene])
-VLC_ADD_PLUGIN([yuv])
-
-ALIASES="${ALIASES} cvlc"
-
-dnl
-dnl default modules that need g++
-dnl
-AC_LANG_PUSH(C++)
-VLC_ADD_PLUGIN([spatializer])
-AC_LANG_POP(C++)
-
-if test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([gestures])
- VLC_ADD_PLUGIN([rc])
- VLC_ADD_PLUGIN([hotkeys])
- VLC_ADD_PLUGIN([showintf])
- VLC_ADD_PLUGIN([marq])
- VLC_ADD_PLUGIN([podcast])
- VLC_ADD_PLUGIN([shout])
- VLC_ADD_PLUGIN([sap])
- VLC_ADD_PLUGIN([mediadirs])
- VLC_ADD_PLUGIN([fake])
- VLC_ADD_PLUGIN([folder])
- VLC_ADD_PLUGIN([rss])
- VLC_ADD_PLUGIN([mosaic])
- VLC_ADD_PLUGIN([wall])
- VLC_ADD_PLUGIN([motiondetect])
- VLC_ADD_PLUGIN([clone])
- VLC_ADD_PLUGIN([crop])
- VLC_ADD_PLUGIN([erase])
- VLC_ADD_PLUGIN([bluescreen])
- VLC_ADD_PLUGIN([alphamask])
- VLC_ADD_PLUGIN([gaussianblur])
- 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])
- 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([dolby_surround_decoder])
- VLC_ADD_PLUGIN([headphone_channel_mixer])
- VLC_ADD_PLUGIN([normvol])
- VLC_ADD_PLUGIN([audiobargraph_a])
- VLC_ADD_PLUGIN([equalizer])
- VLC_ADD_PLUGIN([param_eq])
- VLC_ADD_PLUGIN([scaletempo])
- VLC_ADD_PLUGIN([a52tospdif])
- VLC_ADD_PLUGIN([dtstospdif])
- 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([audiobargraph_a])
- VLC_ADD_PLUGIN([a52tospdif])
- VLC_ADD_PLUGIN([dtstospdif])
- 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
+ALIASES="${ALIASES} cvlc rvlc"
dnl
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([screensaver])
- VLC_ADD_PLUGIN([motion])
VLC_ADD_PLUGIN([dynamicoverlay])
- VLC_ADD_PLUGIN([signals])
elif test "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGIN([ntservice])
- VLC_ADD_PLUGIN([access_smb])
- VLC_ADD_PLUGIN([dmo])
- VLC_ADD_PLUGIN([msn])
+ VLC_ADD_PLUGIN([access_smb dmo globalhotkeys])
VLC_ADD_LIBS([dmo],[-lole32 -luuid])
- VLC_ADD_PLUGIN([globalhotkeys])
-else
- VLC_ADD_PLUGIN([win32text])
fi
if test "${SYS}" = "darwin"; then
- VLC_ADD_PLUGIN([quartztext])
VLC_ADD_LDFLAGS([quartztext],[-Wl,-framework,ApplicationServices])
fi
;;
esac
])
+have_mmx="no"
+have_mmxext="no"
AS_IF([test "${enable_mmx}" != "no"], [
ARCH="${ARCH} mmx"
AS_IF([test "${ac_cv_c_mmx_intrinsics}" != "no"], [
AC_DEFINE(HAVE_MMX_INTRINSICS, 1,
[Define to 1 if MMX intrinsics are available.])
- VLC_ADD_CFLAGS([memcpymmx i420_rgb_mmx i420_yuy2_mmx i422_yuy2_mmx i420_ymga_mmx],[-mmmx])
+ MMX_CFLAGS="-mmmx"
])
AC_CACHE_CHECK([if $CC groks MMX inline assembly],
AS_IF([test "${ac_cv_mmx_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_MMX, 1,
[Define to 1 inline MMX assembly is available.])
- VLC_ADD_PLUGIN([memcpymmx])
- VLC_ADD_PLUGIN([i420_rgb_mmx])
- VLC_ADD_PLUGIN([i420_yuy2_mmx])
- VLC_ADD_PLUGIN([i422_yuy2_mmx])
- VLC_ADD_PLUGIN([i420_ymga_mmx])
+ have_mmx="yes"
])
AC_CACHE_CHECK([if $CC groks MMX EXT inline assembly],
AS_IF([test "${ac_cv_mmxext_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_MMXEXT, 1,
[Define to 1 if MMX EXT inline assembly is available.])
- VLC_ADD_PLUGIN([memcpymmxext])
+ have_mmxext="yes"
])
])
+AC_SUBST(MMX_CFLAGS)
+AM_CONDITIONAL([HAVE_MMX], [test "${have_mmx}" = "yes"])
+AM_CONDITIONAL([HAVE_MMXEXT], [test "${have_mmxext}" = "yes"])
dnl Check for fully workin SSE2 intrinsics
dnl We need support for -mmmx, we need <emmintrin.h>, and we also need a
dnl working compiler (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23963)
AC_ARG_ENABLE(sse,
-[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)]
-,, [
+[ --disable-sse disable SSE (1, 2, 3 and 4) optimizations (default auto)],
+, [
case "${host_cpu}" in
i686|x86_64)
enable_sse=yes
;;
esac
])
+have_sse2="no"
AS_IF([test "${enable_sse}" != "no"], [
ARCH="${ARCH} sse sse2"
AS_IF([test "${ac_cv_c_sse2_intrinsics}" != "no"], [
AC_DEFINE(HAVE_SSE2_INTRINSICS, 1,
[Define to 1 if SSE2 intrinsics are available.])
- VLC_ADD_CFLAGS([i420_rgb_sse2 i420_yuy2_sse2 i422_yuy2_sse2],[-msse2])
+ SSE2_CFLAGS="-msse2"
])
AC_CACHE_CHECK([if $CC groks SSE inline assembly],
AS_IF([test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"], [
AC_DEFINE(CAN_COMPILE_SSE2, 1,
[Define to 1 if SSE2 inline assembly is available.])
- VLC_ADD_PLUGIN([i420_rgb_sse2])
- VLC_ADD_PLUGIN([i420_yuy2_sse2])
- VLC_ADD_PLUGIN([i422_yuy2_sse2])
+ have_sse2="yes"
])
# SSE3
AC_DEFINE(CAN_COMPILE_SSE4A, 1,
[Define to 1 if SSE4A inline assembly is available.]) ])
])
+AC_SUBST(SSE2_CFLAGS)
+AM_CONDITIONAL([HAVE_SSE2], [test "$have_sse2" = "yes"])
+have_3dnow="no"
AC_CACHE_CHECK([if $CC groks 3D Now! inline assembly],
[ac_cv_3dnow_inline],
[CFLAGS="${CFLAGS_save}"
AS_IF([test "${ac_cv_3dnow_inline}" != "no"], [
AC_DEFINE(CAN_COMPILE_3DNOW, 1,
[Define to 1 if 3D Now! inline assembly is available.])
- VLC_ADD_PLUGIN([memcpy3dn])
+ have_3dnow="yes"
])
+AM_CONDITIONAL([HAVE_3DNOW], [test "$have_3dnow" = "yes"])
AC_ARG_ENABLE(neon,
-[ --disable-neon disable NEON optimizations (default auto)],, [
+[ --disable-neon disable NEON optimizations (default auto)],, [
AS_IF([test "${host_cpu}" = "arm"], [enable_neon="yes"] ,[enable_neon="no"])
])
AS_IF([test "${enable_neon}" != "no"], [
AC_CACHE_CHECK([if $CC groks NEON inline assembly], [ac_cv_neon_inline], [
+ CFLAGS="${CFLAGS_save} -mfpu=neon"
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM(,[[asm volatile("vqmovun.s64 d0, q1":::"d0");]])
], [
- ac_cv_neon_inline="yes"
+ ac_cv_neon_inline="-mfpu=neon"
], [
ac_cv_neon_inline="no"
])
+ CFLAGS="${CFLAGS_save}"
])
+ ARM_NEON_CFLAGS="$ac_cv_neon_inline"
+], [
+ ac_cv_neon_inline="no"
])
-AM_CONDITIONAL(HAVE_NEON, [test "${ac_cv_neon_inline}" = "yes"])
+AC_SUBST(ARM_NEON_CFLAGS)
+AM_CONDITIONAL(HAVE_ARM_NEON, [test "${ac_cv_neon_inline}" != "no"])
+
AC_ARG_ENABLE(altivec,
[ --disable-altivec disable AltiVec optimizations (default auto)],, [
AS_IF([test "${host_cpu}" = "powerpc"],
[enable_altivec=yes], [enable_altivec=no])
])
+have_altivec="no"
AS_IF([test "${enable_altivec}" = "yes"], [
ARCH="${ARCH} altivec";
AC_CACHE_CHECK([if $CC groks AltiVec inline assembly],
VLC_ADD_CFLAGS([i420_yuy2_altivec],[${ac_cv_altivec_inline}])
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_altivec_inline}])
])
- VLC_ADD_PLUGIN([memcpyaltivec])
- VLC_ADD_PLUGIN([i420_yuy2_altivec])
+ have_altivec="yes"
])
dnl The AltiVec C extensions
VLC_ADD_CFLAGS([libvlccore],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])
VLC_ADD_CFLAGS([i420_yuy2_altivec memcpyaltivec deinterlace],[${ac_cv_c_altivec} ${ac_cv_c_altivec_abi}])
- VLC_ADD_PLUGIN([memcpyaltivec])
- VLC_ADD_PLUGIN([i420_yuy2_altivec])
+ have_altivec="yes"
])
AC_CACHE_CHECK([if linker needs -framework vecLib],
VLC_ADD_LDFLAGS([libvlccore idctaltivec motionaltivec memcpyaltivec],[-Wl,-framework,vecLib])
])
])
+AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
dnl
dnl Special arch tuning
if test "x${have_lua}" = "xyes" ; then
VLC_ADD_LIBS([lua],[$LUA_LIBS])
VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
+ else
+ AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
fi
fi
AM_CONDITIONAL(BUILD_LUA, [test "${have_lua}" = "yes"])
[ --enable-httpd HTTP daemon (default enabled)])
if test "${enable_httpd}" != "no"
then
- VLC_ADD_PLUGIN([http])
+ VLC_ADD_PLUGIN([oldhttp])
AC_DEFINE(ENABLE_HTTPD, 1, Define if you want the HTTP dameon support)
fi
AM_CONDITIONAL(BUILD_HTTPD, [test "${enable_httpd}" != "no"])
AC_MSG_ERROR([VLM requires the stream output. Do not use --disable-sout.])
])
AC_DEFINE(ENABLE_VLM, 1, [Define if you want the VideoLAN manager support])
- VLC_ADD_PLUGIN([telnet])
+ VLC_ADD_PLUGIN([oldtelnet])
])
AM_CONDITIONAL([ENABLE_VLM], [test "${enable_vlm}" != "no"])
AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
VLC_ADD_PLUGIN([growl])
VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ VLC_ADD_OBJCFLAGS([growl], [-fobjc-exceptions] )
])
]
)
dnl
PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
-dnl
-dnl Audioscrobbler plugin
-dnl
-
-AC_ARG_ENABLE(audioscrobbler,
- [ --disable-audioscrobbler Last.fm submission plugin (default enabled)])
-AS_IF([test "${enable_audioscrobbler}" != "no"], [
- VLC_ADD_PLUGIN([audioscrobbler])
- ])
-
dnl
dnl Taglibplugin
dnl
dnl live555 input
dnl
-if test "${enable_livedotcom}"
-then
- AC_MSG_WARN(--{en|dis}able-livedotcom is deprecated. Use --{en|dis}able-live555 instead.)
-fi
-if test "${enable_livedotcom}" = "no"
-then
- enable_live555="no"
-fi
-
AC_ARG_ENABLE(live555,
[ --enable-live555 live555 RTSP input plugin (default enabled)])
if test "${enable_live555}" != "no"; then
AC_ARG_WITH(live555-tree,
- [ --with-live555-tree=PATH live.com tree for static linking])
+ [ --with-live555-tree=PATH live.com tree for static linking])
dnl
dnl test for --with-live555-tree
dnl
- 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}"
- fi
-
if test -z "${with_live555_tree}" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++)
CPPFLAGS_save="${CPPFLAGS}"
dnl dvdread module: check for libdvdread
dnl
AC_ARG_ENABLE(dvdread,
-[ --enable-dvdread dvdread input module (default disabled)])
+[ --enable-dvdread dvdread input module (default enabled)])
if test "${enable_dvdread}" != "no"
then
AC_ARG_WITH(dvdread,
- [ --with-dvdread=PATH libdvdread headers and libraries])
+ [ --with-dvdread=PATH libdvdread headers and libraries])
AC_ARG_WITH(dvdread-tree,
- [ --with-dvdread-tree=PATH libdvdread tree for static linking])
+ [ --with-dvdread-tree=PATH libdvdread tree for static linking])
dnl Temporary hack (yeah, sure ;)
if test "${SYS}" = "mingw32" || test "${SYS}" = "darwin" || test "${SYS}" = "beos" ; then
DVDNAV_PATH="${PATH}"
AC_ARG_WITH(dvdnav-config-path,
- [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
+ [ --with-dvdnav-config-path=PATH dvdnav-config path (default search in \$PATH)],
[ if test "${with_dvdnav_config_path}" != "no"
then
DVDNAV_PATH="${with_dvdnav_config_path}:${PATH}"
if test "${enable_opencv}" = "yes" -a "${CXX}" != "";
then
AC_ARG_WITH(opencv-tree,
- [ --with-opencv-tree=PATH opencv tree for linking])
+ [ --with-opencv-tree=PATH opencv tree for linking])
if test "${SYS}" = "mingw32"
then
test -z "${with_opencv_tree}" && AC_MSG_ERROR([You have to specify --with-opencv-tree])
else
PKG_CHECK_MODULES(OPENCV, opencv,
[
- VLC_ADD_PLUGIN([opencv_example])
- VLC_ADD_PLUGIN([opencv_wrapper])
+ VLC_ADD_PLUGIN([opencv_example opencv_wrapper])
VLC_ADD_LIBS([opencv_example opencv_wrapper],[${OPENCV_LIBS}])
VLC_ADD_CFLAGS([opencv_wrapper],[${OPENCV_CFLAGS}])
VLC_ADD_CXXFLAGS([opencv_example],[${OPENCV_CFLAGS}])
if test "${enable_dvbpsi}" != "no"
then
AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi=PATH libdvbpsi headers and libraries])
+ [ --with-dvbpsi=PATH libdvbpsi headers and libraries])
AC_ARG_WITH(dvbpsi,
- [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
+ [ --with-dvbpsi-tree=PATH libdvbpsi tree for static linking])
case "${with_dvbpsi}" in
""|yes)
if test -z "${with_dvbpsi_tree}"
AC_CHECK_HEADERS([dvbpsi/dr.h],[
VLC_ADD_PLUGIN([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_PLUGIN([mux_ts])
+ AC_CHECK_LIB(dvbpsi, dvbpsi_SDTServiceAddDescriptor,
+ [VLC_ADD_PLUGIN([mux_ts])], [], [${LDFLAGS_test} -ldvbpsi])
fi
VLC_ADD_CPPFLAGS([mux_ts ts dvb],[${CPPFLAGS_test}])
VLC_ADD_LIBS([mux_ts ts dvb],[${LDFLAGS_test} -ldvbpsi])
],[
if test -n "${enable_dvbpsi}"
then
- AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.1])
+ AC_MSG_ERROR([Could not find libdvbpsi on your system: you may get it from www.videolan.org, you'll need at least version 0.1.6])
fi
],
[#if defined( HAVE_STDINT_H )
if test "${enable_v4l}" = "yes"
then
AC_ARG_WITH(v4l,
- [ --with-v4l=PATH path to a v4l-enabled kernel tree],[],[])
+ [ --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])
dnl libv4l1 support for video4linux.
dnl
AC_ARG_ENABLE( libv4l,
- [ --enable-libv4l Libv4l Video4Linux support (default enabled)])
+ [ --enable-libv4l Libv4l Video4Linux support (default enabled)])
if test "${enable_libv4l}" != "no" -a "${enable_v4l}" != "no"
then
PKG_CHECK_MODULES( LIBV4L, libv4l1, [
if test "${enable_v4l2}" != "no"
then
AC_ARG_WITH(v4l2,
- [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[])
+ [ --with-v4l2=PATH path to a v4l2-enabled kernel tree],[],[])
if test "${with_v4l2}" != "no" -a -n "${with_v4l2}"
then
VLC_ADD_CPPFLAGS([v4l2],[-I${with_v4l2}/include])
dnl
PKG_ENABLE_MODULES_VLC([GNOMEVFS], [access_gnomevfs], [gnome-vfs-2.0], [GnomeVFS access module], [auto])
-
-dnl Need to test libcdio and libvcdinfo for a number of things. Do it now.
-AC_ARG_ENABLE(libcdio,
- [ --enable-libcdio CD input and control library support (default enabled)])
-
-AC_ARG_ENABLE(vcdinfo,
- [ --enable-vcdinfo VCD information library support (default enabled)])
-
-have_libcdio=no
-have_libvcdinfo=no
-if test "${enable_libcdio}" != "no"
-then
- PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2,
- have_libcdio=yes
- 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)])
-
- if test "${enable_vcdinfo}" != "no"
- then
- PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
- [have_libvcdinfo=yes],
- [AC_MSG_WARN(VCD information library not found)])
- fi
-fi
-
dnl
-dnl VCDX and CDDAX modules
+dnl VCDX modules
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"
- then
- AC_DEFINE(HAVE_CDDAX, 1, [Define for the audio CD plugin using libcdio])
- VLC_ADD_LIBS([cddax],[$LIBCDIO_LIBS])
- VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
- VLC_ADD_PLUGIN([cddax])
- 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
- 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
- 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)
- 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
- AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found or disabled])
- HAVE_VCDX=no
- fi
-
- PKG_CHECK_MODULES(LIBCDIO, libiso9660 >= 0.72,
- [VLC_ADD_LIBS([vcdx],[$LIBISO9660_LIBS])
- VLC_ADD_CFLAGS([vcdx],[$LIBISO9660_CFLAGS])],
- [AC_MSG_WARN([vcdx plugin disabled because ok libiso9660 library not found])
- HAVE_VCDX=no])
-
- if test "$have_libvcdinfo" = "yes"
- then
- 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
- AC_MSG_WARN([vcdx plugin disabled because ok libvcdinfo library not found])
- HAVE_VCDX=no
- fi
+ PKG_CHECK_MODULES(LIBCDIO, [libcdio >= 0.78.2 libiso9660 >= 0.72],
+ [VLC_ADD_LIBS([vcdx],[$LIBCDIO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBCDIO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libcdio >= 0.78.2 and libiso9660 >= 0.72])])
+ PKG_CHECK_MODULES(LIBVCDINFO, libvcdinfo >= 0.7.22,
+ [VLC_ADD_LIBS([vcdx],[$LIBVCDINFO_LIBS])
+ VLC_ADD_CFLAGS([vcdx],[$LIBVCDINFO_CFLAGS])],
+ [AC_MSG_ERROR([vcdx plugin requires libvcdinfo library >= 0.7.22])])
+ VLC_ADD_PLUGIN([vcdx])
fi
dnl
dnl Built-in CD-DA and VCD module
dnl
-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)])
+ [ --enable-vcd built-in VCD and CD-DA (default enabled)])
+
+AC_ARG_ENABLE(libcddb,
+ [ --enable-libcddb CDDB support for libcdio audio CD (default enabled)])
if test "${enable_vcd}" != "no"
then
AC_MSG_CHECKING(for cdrom_msf0 in linux/cdrom.h)
AC_EGREP_HEADER(cdrom_msf0,linux/cdrom.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
],[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING(for scsireq in sys/scsiio.h)
AC_EGREP_HEADER(scsireq,sys/scsiio.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
AC_DEFINE(HAVE_SCSIREQ_IN_SYS_SCSIIO_H, 1, For NetBSD VCD support)
],[
AC_MSG_RESULT(no)
AC_MSG_CHECKING(for ioc_toc_header in sys/cdio.h)
AC_EGREP_HEADER(ioc_toc_header ,sys/cdio.h,[
AC_MSG_RESULT(yes)
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
AC_DEFINE(HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H, 1, For FreeBSD VCD support)
],[
AC_MSG_RESULT(no)
if test "${SYS}" = "bsdi" -o "${SYS}" = "mingw32"
then
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
+ VLC_ADD_PLUGIN([vcd cdda])
fi
if test "${SYS}" = "darwin"
then
- VLC_ADD_PLUGIN([vcd])
- VLC_ADD_PLUGIN([cdda])
- VLC_ADD_LDFLAGS([vcd vcdx cdda cddax],[-Wl,-framework,IOKit,-framework,CoreFoundation])
- VLC_ADD_LIBS([vcdx cddax cdda],[-liconv])
+ VLC_ADD_PLUGIN([vcd cdda])
+ VLC_ADD_LDFLAGS([vcd vcdx cdda],[-Wl,-framework,IOKit,-framework,CoreFoundation])
+ VLC_ADD_LIBS([vcdx cdda],[-liconv])
fi
if test "$enable_libcddb" != "no"; then
then
AS_IF([test "${have_dvbpsi}" = "yes" ],[
AC_ARG_WITH(dvb,
- [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
+ [ --with-dvb=PATH path to a dvb- and v4l2-enabled kernel tree],[],[])
if test "${with_dvb}" != "no" -a -n "${with_dvb}"
then
VLC_ADD_CFLAGS([dvb],[-I${with_dvb}/include])
fi
dnl
-dnl ipv6 plugin - not for QNX yet
+dnl ipv6 plugin
dnl
have_ipv6=no
AC_CHECK_FUNCS(inet_pton,[have_ipv6=yes],[
if test "${enable_mod}" != "no"
then
AC_ARG_WITH(mod-tree,
- [ --with-mod-tree=PATH mod tree for static linking])
+ [ --with-mod-tree=PATH mod tree for static linking])
if test -n "${with_mod_tree}"
then
AC_MSG_CHECKING(for libmodplug.a in ${with_mod_tree})
AC_MSG_ERROR([cannot find ${real_mod_tree}/src/.libs/libmodplug.a, make sure you compiled mod in ${with_mod_tree}])
fi
else
- AC_CHECK_HEADERS(libmodplug/modplug.h, [
- VLC_ADD_PLUGIN([mod])
- VLC_ADD_CXXFLAGS([mod],[])
- VLC_ADD_LIBS([mod],[-lmodplug -lstdc++])])
+ PKG_CHECK_MODULES(LIBMODPLUG, libmodplug >= 0.8,
+ [ VLC_ADD_PLUGIN([mod])
+ VLC_ADD_CXXFLAGS([mod],[$LIBMODPLUG_CFLAGS])
+ VLC_ADD_LIBS([mod],[$LIBMODPLUG_LIBS])
+ ],[AC_MSG_WARN([libmodplug not found!])])
fi
fi
then
AC_LANG_PUSH(C++)
AC_ARG_WITH(gme-tree,
- [ --with-gme-tree=PATH gme tree for static linking])
+ [ --with-gme-tree=PATH gme tree for static linking])
if test -n "${with_gme_tree}"
then
AC_MSG_CHECKING(for libgme.a in ${with_mod_tree})
if test "${enable_mad}" != "no"
then
AC_ARG_WITH(mad,
- [ --with-mad=PATH path to libmad],[],[])
+ [ --with-mad=PATH path to libmad],[],[])
if test "${with_mad}" != "no" -a -n "${with_mad}"
then
VLC_ADD_CPPFLAGS([mpgatofixed32],[-I${with_mad}/include])
fi
AC_ARG_WITH(mad-tree,
- [ --with-mad-tree=PATH mad tree for static linking],[],[])
+ [ --with-mad-tree=PATH mad tree for static linking],[],[])
if test "${with_mad_tree}" != "no" -a -n "${with_mad_tree}"
then
real_mad_tree="`cd ${with_mad_tree} 2>/dev/null && pwd`"
])
AC_ARG_ENABLE(merge-ffmpeg,
-[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
+[ --enable-merge-ffmpeg merge FFmpeg-based plugins (default disabled)],, [
enable_merge_ffmpeg="no"
])
AM_CONDITIONAL([MERGE_FFMPEG], [test "$enable_merge_ffmpeg" != "no"])
dnl
dnl avcodec decoder/encoder plugin
dnl
-
-if test "${with_ffmpeg_tree}"
-then
- AC_MSG_WARN([--with-ffmpeg-tree is deprecated. Use PKG_CONFIG_PATH instead.])
-fi
-
AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
if test "${enable_avcodec}" != "no"
dnl libva needs avcodec
dnl
AC_ARG_ENABLE(libva,
- [ --enable-libva libva VAAPI support (default disabled)])
-AS_IF([test "${enable_libva}" = "yes"], [
+ [ --enable-libva libva VAAPI support (default auto)])
+
+AS_IF([test "${enable_libva}" != "no"], [
AS_IF([test "x${have_avcodec}" = "xyes"], [
PKG_CHECK_MODULES(LIBVA, [libva libva-x11],
[
- VLC_ADD_LIBS([avcodec],[$LIBVA_LIBS])
- VLC_ADD_CFLAGS([avcodec],[$LIBVA_CFLAGS])
- AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ VLC_SAVE_FLAGS
+ 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])
+ AC_DEFINE(HAVE_AVCODEC_VAAPI, 1, [Define if avcodec has to be built with VAAPI support.])
+ echo "VAAPI acceleration activated"
+ ],[
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([libva is present but libavcodec/vaapi.h is missing])],
+ [AC_MSG_WARN([libva is present but libavcodec/vaapi.h is missing ])])
+ ])
+ VLC_RESTORE_FLAGS
],[
- AC_MSG_ERROR([Could not find libva.])
+ AS_IF([test "${enable_libva}" == "yes"],
+ [AC_MSG_ERROR([Could not find required libva.])],
+ [AC_MSG_WARN([libva not found ])])
+ ])
+ ],[
+ AS_IF([test "x${enable_libva}" != "x"], [
+ AC_MSG_ERROR([--enable-libva and --disable-avcodec options are mutually exclusive.])
])
+ ])
+])
+
+dnl
+dnl dxva2 needs avcodec
+dnl
+AC_ARG_ENABLE(dxva2,
+ [ --enable-dxva2 DxVA2 support (default auto)])
+
+AS_IF([test "${enable_dxva2}" != "no"], [
+ if test "${SYS}" = "mingw32"; then
+ AS_IF([test "x${have_avcodec}" = "xyes"], [
+ AC_CHECK_HEADERS(dxva2api.h,
+ [
+ AC_CHECK_HEADERS(libavcodec/dxva2.h, [
+ VLC_ADD_LIBS([avcodec],[-lole32 -lshlwapi -luuid])
+ AC_DEFINE(HAVE_AVCODEC_DXVA2, 1, [Define if avcodec has to be built with DxVA2 support.])
+ echo "DxVA2 acceleration activated"
+ ],[
+ 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 ])])
+ ])
+ ],[
+ AS_IF([test "${enable_dxva2}" == "yes"],
+ [AC_MSG_ERROR([Could not find required dxva2api.h])],
+ [AC_MSG_WARN([dxva2api.h not found])])
+ ])
],[
- AC_MSG_ERROR([libva VAAPI support depends on libavcodec.])
+ AS_IF([test "x${enable_dxva2}" != "x"], [
+ AC_MSG_ERROR([--enable-dxva2 and --disable-avcodec options are mutually exclusive.])
+ ])
])
+ fi
])
+
dnl
dnl stream_out switcher needs libavcodec
dnl
AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h)
AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
AS_IF([test "$enable_merge_ffmpeg" = "no"], [
- VLC_ADD_PLUGIN([avformat])
- VLC_ADD_LIBS([avformat],[$AVFORMAT_LIBS $AVUTIL_LIBS])
- VLC_ADD_CFLAGS([avformat],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
-
- VLC_ADD_PLUGIN([access_avio])
- VLC_ADD_LIBS([access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
- VLC_ADD_CFLAGS([access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
+ VLC_ADD_PLUGIN([avformat access_avio])
+ VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
+ VLC_ADD_CFLAGS([avformat access_avio],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
], [
VLC_ADD_LIBS([avcodec],[$AVFORMAT_LIBS $AVUTIL_LIBS])
VLC_ADD_CFLAGS([avcodec],[$AVFORMAT_CFLAGS $AVUTIL_CFLAGS])
if test "${enable_faad}" = "yes"
then
AC_ARG_WITH(faad-tree,
- [ --with-faad-tree=PATH faad tree for static linking])
+ [ --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})
AC_ARG_ENABLE(real,
[ --enable-real Real media module (default disabled)])
if test "${enable_real}" = "yes"; then
- VLC_ADD_PLUGIN([realaudio])
VLC_ADD_PLUGIN([realvideo])
fi
if test "${enable_a52}" != "no"
then
AC_ARG_WITH(a52,
- [ --with-a52=PATH a52 headers and libraries])
+ [ --with-a52=PATH a52 headers and libraries])
AC_ARG_WITH(a52-tree,
- [ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
+ [ --with-a52-tree=PATH a52dec tree for static linking ],[],[])
if test "${with_a52_tree}" != "no" -a -n "${with_a52_tree}"
then
real_a52_tree="`cd ${with_a52_tree} 2>/dev/null && pwd`"
fi
AC_ARG_WITH(a52-fixed,
- [ --with-a52-fixed specify if liba52 has been compiled with fixed point support],
+ [ --with-a52-fixed specify if liba52 has been compiled with fixed point support],
[
VLC_ADD_CPPFLAGS([a52tofloat32],[-DLIBA52_FIXED]) ])
dnl
dnl DTS Coherent Acoustics decoder plugin
dnl
-AS_IF([test "x${enable_dts}" != "x"], [
- AC_MSG_ERROR([--enable-dts is obsolete. Please use libdca and --enable-dca.])
-])
PKG_ENABLE_MODULES_VLC([DCA], [dtstofloat32], [libdca >= 0.0.5], [DTS Coherent Acoustics support with libdca], [auto])
dnl
dnl
PKG_ENABLE_MODULES_VLC([SPEEX], [], [ogg speex >= 1.0.5], [Speex decoder support], [auto])
-dnl
-dnl tarkin decoder plugin
-dnl
-AC_ARG_ENABLE(tarkin,
-[ --enable-tarkin experimental tarkin codec (default disabled)])
-if test "${enable_tarkin}" = "yes"
-then
- AC_ARG_WITH(tarkin-tree,
- [ --with-tarkin-tree=PATH tarkin tree for static linking])
- if test -n "${with_tarkin_tree}"
- then
- AC_MSG_CHECKING(for tarkin.o in ${with_tarkin_tree})
- real_tarkin_tree="`cd ${with_tarkin_tree} 2>/dev/null && pwd`"
- if test -f "${real_tarkin_tree}/tarkin.o"
- then
- VLC_ADD_PLUGIN([tarkin])
- VLC_ADD_CPPFLAGS([tarkin],[-I${real_tarkin_tree}])
- VLC_ADD_LIBS([tarkin],[${real_tarkin_tree}/mem.o ${real_tarkin_tree}/pnm.o ${real_tarkin_tree}/wavelet.o ${real_tarkin_tree}/wavelet_xform.o ${real_tarkin_tree}/wavelet_coeff.o ${real_tarkin_tree}/yuv.o ${real_tarkin_tree}/tarkin.o ${real_tarkin_tree}/info.o -logg])
- AC_MSG_RESULT(yes)
- else
- dnl The given tarkin tree wasn't built
- AC_MSG_RESULT(no)
- AC_MSG_ERROR([cannot find ${real_tarkin_tree}/tarkin.o,
- make sure you compiled tarkin in ${with_tarkin_tree}])
- fi
- fi
-fi
-
dnl
dnl theora decoder plugin
dnl
LDFLAGS="${LDFLAGS_save} -lz"
AC_CHECK_LIB(png, png_set_rows, [
VLC_ADD_LIBS([png],[-lpng -lz])
- VLC_ADD_PLUGIN([png])
- VLC_ADD_PLUGIN([osdmenu])
- VLC_ADD_PLUGIN([osd_parser])],
+ VLC_ADD_PLUGIN([png osdmenu osd_parser])],
[],[-lz])
LDFLAGS="${LDFLAGS_save}"
])
[ --enable-x264 H264 encoding support with libx264 (default enabled)])
if test "${enable_x264}" != "no"; then
AC_ARG_WITH(x264-tree,
- [ --with-x264-tree=PATH x264 tree for static linking ],[],[])
+ [ --with-x264-tree=PATH x264 tree for static linking ],[],[])
if test "${with_x264_tree}" != "no" -a -n "${with_x264_tree}"
then
real_x264_tree="`cd ${with_x264_tree} 2>/dev/null && pwd`"
AS_IF( [test "${enable_zvbi}" != "no"],[
PKG_CHECK_MODULES(ZVBI,
- zvbi-0.2 >= 0.2.25,
+ zvbi-0.2 >= 0.2.28,
[
VLC_ADD_LIBS([zvbi],[$ZVBI_LIBS])
if test "${SYS}" = "mingw32"; then
])
])
-dnl
-dnl CMML plugin
-dnl
-AC_ARG_ENABLE(cmml,
- [ --enable-cmml CMML support (default enabled)])
-if test "${enable_cmml}" != "no"
-then
- VLC_ADD_PLUGIN([cmml])
-fi
-
dnl
dnl kate decoder plugin
dnl
dnl
AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [
- AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+ AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "darwin"], [
enable_xcb="yes"
], [
enable_xcb="no"
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([xcb_x11])
- VLC_ADD_PLUGIN([xcb_screen])
- VLC_ADD_PLUGIN([xcb_apps])
+ VLC_ADD_PLUGIN([screensaver xcb_x11 xcb_screen xcb_apps])
VLC_SET_CFLAGS_WERROR([xcb_screen], [-Wno-error=uninitialized]) # some gcc report a warning which doesn't reveal an error
AS_IF([test "${enable_xvideo}" != "no"], [
AS_IF([test "${have_xcb_keysyms}" = "yes"], [
PKG_CHECK_MODULES(XPROTO, [xproto])
- VLC_ADD_PLUGIN([xcb_window])
- VLC_ADD_PLUGIN([globalhotkeys])
+ VLC_ADD_PLUGIN([xcb_window globalhotkeys])
VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
VLC_ADD_LIBS([globalhotkeys], [${XCB_KEYSYMS_LIBS} ${XCB_LIBS}])
])
AC_ARG_ENABLE(opengl,
[ --enable-opengl OpenGL support (default enabled)])
if test "${enable_opengl}" != "no" &&
- test "${SYS}" != "beos" -a "${SYS}" != "mingwce"; then
- if test "${SYS}" != "darwin"; then
- AC_CHECK_HEADERS(GL/gl.h GL/glu.h, [
- VLC_ADD_PLUGIN([opengl])
- if test "${SYS}" != "mingw32"; then
- VLC_ADD_LIBS([opengl],[${X_LIBS} -lGL -lGLU])
- else
- VLC_ADD_LIBS([opengl],[-lopengl32 -lglu32])
- fi
- ])
- else
+ test "${SYS}" = "darwin"; then
dnl OS X special case (no GL/gl.h but OpenGL/gl.h)
VLC_ADD_PLUGIN([opengl])
VLC_ADD_LIBS([opengl],[-Wl,-framework,OpenGL])
- fi
fi
dnl
then
SDL_PATH="${PATH}"
AC_ARG_WITH(sdl-config-path,
- [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
+ [ --with-sdl-config-path=PATH sdl-config path (default search in \$PATH)],
[ if test "${with_sdl_config_path}" != "no"
then
SDL_PATH="${with_sdl_config_path}:${PATH}"
PKG_CHECK_MODULES(SDL, [sdl >= 1.2.10], [
# SDL on Darwin is heavily patched and can only run SDL_image
if test "${SYS}" != "darwin"; then
- VLC_ADD_PLUGIN([vout_sdl])
- VLC_ADD_PLUGIN([aout_sdl])
+ VLC_ADD_PLUGIN([vout_sdl aout_sdl])
fi
VLC_ADD_CFLAGS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --cflags | sed 's,SDL,,'`])
VLC_ADD_LIBS([vout_sdl aout_sdl sdl_image],[`${SDL_CONFIG} --libs | sed 's,-rdynamic,,'`])
AC_ARG_ENABLE(fribidi,
[ --enable-fribidi fribidi support (default enabled)])
AC_ARG_ENABLE(fontconfig,
- [ --enable-fontconfig, fontconfig support (default enabled)])
+ [ --enable-fontconfig fontconfig support (default enabled)])
if test "${enable_freetype}" != "no"
then
PKG_CHECK_MODULES(FREETYPE, freetype2,[
VLC_ADD_PLUGIN([snapshot])
fi
-dnl
-dnl Qt Embedded module
-dnl (disabled by default)
-dnl
-AC_ARG_ENABLE(qte,
- [ --enable-qte QT Embedded support (default disabled)])
-if test "${enable_qte}" = "yes"
-then
- AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
- VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
- else
- VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
- VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
- fi
- VLC_ADD_PLUGIN([qte])
- NEED_QTE_MAIN=yes
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
- AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
- AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
- ] )
- CPPFLAGS="${CPPFLAGS_save}"
-fi
-
dnl
dnl Roku HD1000 Video output module
dnl
if test "${SYS}" = "mingw32" -o "${SYS}" = "mingwce"
then
AC_CHECK_HEADERS(ddraw.h,
- [ VLC_ADD_PLUGIN([directx])
- VLC_ADD_PLUGIN([aout_directx])
+ [ VLC_ADD_PLUGIN([directx aout_directx])
VLC_ADD_LIBS([directx],[-lgdi32])
],[AC_MSG_ERROR([Cannot find DirectX headers!])]
)
VLC_ADD_LIBS([wingdi],[-lgdi32 -lole32])
fi
if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([wingdi])
- VLC_ADD_PLUGIN([wingapi])
+ VLC_ADD_PLUGIN([wingdi wingapi])
VLC_ADD_LIBS([wingdi],[-laygshell])
VLC_ADD_LIBS([wingapi],[-laygshell])
fi
])
fi
-dnl
-dnl Linux MGA module
-dnl
-AC_ARG_ENABLE(mga,
- [ --enable-mga Linux kernel Matrox support (default disabled)],
- [ if test "${enable_mga}" = "yes"
- then
- VLC_ADD_PLUGIN([mga])
- fi ])
-
dnl
dnl OMAP Framebuffer module
dnl
AC_ARG_ENABLE(directfb,
[ --enable-directfb DirectFB support (default disabled)])
AC_ARG_WITH(directfb,
- [ --with-directfb=PATH path to DirectFB headers and libraries])
+ [ --with-directfb=PATH path to DirectFB headers and libraries])
if test "${enable_directfb}" = "yes"; then
have_directfb="false"
VLC_ADD_PLUGIN([ggi])
VLC_ADD_LIBS([ggi],[-lggi])
AC_ARG_WITH(ggi,
- [ --with-ggi=PATH path to libggi],
+ [ --with-ggi=PATH path to libggi],
[ if test "${with_ggi}" != "no" -a -n "${with_ggi}"
then
VLC_ADD_CPPFLAGS([ggi],[-I${with_ggi}/include])
dnl
dnl libcaca plugin
dnl
-PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta1], [libcaca output],[auto])
+PKG_ENABLE_MODULES_VLC([CACA], [], [caca >= 0.99.beta14], [libcaca output],[auto])
dnl
dnl Audio plugins
test "${enable_oss}" = "yes")
then
AC_CHECK_HEADERS([soundcard.h sys/soundcard.h], [
- VLC_ADD_PLUGIN([oss])
- VLC_ADD_PLUGIN([access_oss])
- AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss],[-lossaudio])
- VLC_ADD_LIBS([access_oss],[-lossaudio])])
+ VLC_ADD_PLUGIN([oss access_oss])
+ AC_CHECK_LIB(ossaudio,main,[VLC_ADD_LIBS([oss access_oss],[-lossaudio])])
])
fi
dnl
dnl ALSA module
dnl
-PKG_ENABLE_MODULES_VLC([ALSA], [], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
-PKG_ENABLE_MODULES_VLC([ACCESS_ALSA], [access_alsa], [alsa >= 1.0.0], [Alsa access for linux], [auto])
+PKG_ENABLE_MODULES_VLC([ALSA], [alsa access_alsa], [alsa >= 1.0.0], [Alsa sound support for linux], [auto])
dnl
dnl win32 waveOut plugin
dnl
AC_ARG_ENABLE(macosx-audio,
[ --enable-macosx-audio Mac OS X audio module (default enabled on MacOS X)])
-if test "${enable_macosx-audio}" != "no" &&
- (test "${SYS}" = "darwin" || test "${enable_macosx-audio}" = "yes")
+if test "x${enable_macosx_audio}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_audio}" = "yes")
then
AC_CHECK_HEADERS(CoreAudio/CoreAudio.h,
[ VLC_ADD_PLUGIN([auhal])
dnl
dnl JACK modules
dnl
-PKG_ENABLE_MODULES_VLC([JACK], [jack], [jack], [JACK audio I/O modules],[auto])
-PKG_ENABLE_MODULES_VLC([JACK], [access_jack], [jack], [JACK audio I/O modules],[auto])
+PKG_ENABLE_MODULES_VLC([JACK], [jack access_jack], [jack], [JACK audio I/O modules],[auto])
dnl
[ --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])
+ [ --with-cyberlink-tree=PATH CyberLink for C++ tree for static linking])
dnl
dnl test for --with-cyberlink-tree
AC_ARG_WITH(,[Interface plugins:])
-dnl special case for BeOS
-if test "${SYS}" = "beos"
-then
- VLC_ADD_PLUGIN([beos])
-fi
-
dnl
dnl Skins2 module
dnl
dnl QT 4
dnl
AC_ARG_ENABLE(qt4,
- [ --enable-qt4 QT 4 support (default enabled) ],, [
+ [ --enable-qt4 Qt 4 support (default enabled) ],, [
AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
])
AS_IF([test "${enable_qt4}" != "no"], [
])
AM_CONDITIONAL(ENABLE_QT4, [test "x$enable_qt4" != "xno"])
-dnl
-dnl WinCE GUI module
-dnl
-AC_ARG_ENABLE(wince,
- [ --enable-wince Windows CE interface (default enabled with MinGW)])
-if test "${enable_wince}" != "no"; then
- if test "${SYS}" = "mingwce"; then
- VLC_ADD_PLUGIN([wince])
- VLC_ADD_CXXFLAGS([wince],[])
- VLC_ADD_LIBS([wince],[-lcommctrl -lcommdlg -laygshell])
- dnl Gross hack
- VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o])
- elif test "${SYS}" = "mingw32"; then
- VLC_ADD_CXXFLAGS([wince],[])
- VLC_ADD_LIBS([wince],[-lcomctl32 -lcomdlg32 -lgdi32 -lole32])
- dnl Gross hack
- VLC_ADD_LIBS([wince],[\\\${top_builddir}modules/gui/wince/wince_rc.o])
- fi
-fi
-
dnl
dnl Simple test for skins2 dependency
dnl
AC_MSG_ERROR([The skins2 module depends on a the Qt4 development package. Without it you won't be able to open any dialog box from the interface, which makes the skins2 interface rather useless. Install the Qt4 development package or alternatively you can also configure with: --disable-qt4 --disable-skins2.])
])
-dnl
-dnl Opie QT embedded module
-dnl
-AC_ARG_ENABLE(opie,
- [ --enable-opie Qt embedded interface support (default disabled)],
- [if test "${enable_opie}" = "yes"; then
- AC_ARG_WITH(qte,
- [ --with-qte=PATH Qt Embedded headers and libraries])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- VLC_ADD_LIBS([qte],[-L${with_qte}/lib `echo -L${with_qte}/lib | sed 's,opt/QtPalmtop,usr,'` -ljpeg -lqte])
- VLC_ADD_CXXFLAGS([qte],[-I${with_qte}/include `echo -I${with_qte}/include | sed 's,opt/QtPalmtop,usr,'` -DQT_QWS_IPAQ -DQWS -fno-exceptions -fno-rtti])
- else
- VLC_ADD_LIBS([qte],[-L${QTDIR}/lib `echo -L${QTDIR}/lib | sed 's,opt/QtPalmtop,usr,'`])
- VLC_ADD_CXXFLAGS([qte],[-I${QTDIR}/include `echo -I${QTDIR}/include | sed 's,opt/QtPalmtop,usr,'`])
- fi
- CPPFLAGS="${CPPFLAGS_save} ${CXXFLAGS_qte}"
- AC_CHECK_HEADERS(qt.h jpeglib.h, ,[
- AC_MSG_ERROR([echo "Cannot find QT Embedded development headers."])
- ] )
- CPPFLAGS="${CPPFLAGS_save}"
-
- VLC_ADD_PLUGIN([opie])
- NEED_QTE_MAIN=yes
- VLC_ADD_LIBS([opie],[-lqpe ${LDFLAGS_qte}])
- VLC_ADD_CXXFLAGS([opie],[${CXXFLAGS_qte}])
- if test "${with_qte}" != "no" -a -n "${with_qte}"
- then
- MOC=${with_qte}/bin/moc
- else
- MOC=${QTDIR}/bin/moc
- fi
- fi])
-
dnl
dnl MacOS X video output/gui modules
dnl
AC_ARG_ENABLE(macosx,
- [ --enable-macosx MacOS X support (default enabled on MacOS X)])
+ [ --enable-macosx Mac OS X gui support (default enabled on Mac OS X)])
if test "x${enable_macosx}" = "xyes"
then
- VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
- VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer qtcapture],[-Wl,-framework,Cocoa])
- VLC_ADD_LDFLAGS([macosx minimal_macosx opengllayer],[-Wl,-framework,OpenGL])
+ VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([macosx minimal_macosx],[-Wl,-framework,OpenGL])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,Carbon])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,CoreServices])
VLC_ADD_LDFLAGS([macosx minimal_macosx], [-Wl,-framework,AGL])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,IOKit])
- VLC_ADD_LDFLAGS([macosx], [-F\\\${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
- VLC_ADD_OBJCFLAGS([macosx], [-F\\\${CONTRIB_DIR}/Sparkle])
+ VLC_ADD_LDFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle -Wl,-framework,Sparkle])
+ VLC_ADD_OBJCFLAGS([macosx], [-F${CONTRIB_DIR}/Sparkle])
dnl For bug report
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,AddressBook])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
- VLC_ADD_LDFLAGS([opengllayer qtcapture], [-Wl,-framework,QuartzCore])
- VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx], [-fobjc-exceptions] )
- VLC_ADD_PLUGIN([access_eyetv])
- VLC_ADD_PLUGIN([qtcapture])
- VLC_ADD_PLUGIN([macosx])
- VLC_ADD_PLUGIN([minimal_macosx])
- VLC_ADD_PLUGIN([opengllayer])
+ VLC_ADD_PLUGIN([macosx minimal_macosx])
fi
dnl
-dnl QNX RTOS module
+dnl MacOS X related modules
dnl
-AC_ARG_ENABLE(qnx,
- [ --enable-qnx QNX RTOS support (default enabled on QNX RTOS)])
- if test "${enable_qnx}" != "no"
- then
- AC_CHECK_HEADERS(Ph.h, [
- VLC_ADD_PLUGIN([qnx])
- VLC_ADD_LIBS([qnx],[-lasound -lph])
- ])
- fi
+
+AC_ARG_ENABLE(macosx-vout,
+ [ --enable-macosx-vout Mac OS X video output module (default enabled on Mac OS X)])
+if test "x${enable_macosx_vout}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_vout}" = "yes")
+then
+ VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([vout_macosx],[-Wl,-framework,OpenGL])
+ VLC_ADD_PLUGIN([vout_macosx])
+fi
+
+AC_ARG_ENABLE(macosx-dialog-provider,
+ [ --enable-macosx-dialog-provider Mac OS X dialog module (default enabled on Mac OS X)])
+if test "x${enable_macosx_dialog_provider}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_dialog_provider}" = "yes")
+then
+ VLC_ADD_LDFLAGS([macosx_dialog_provider],[-Wl,-framework,Cocoa])
+ VLC_ADD_PLUGIN([macosx_dialog_provider])
+fi
+
+AC_ARG_ENABLE(macosx-qtcapture,
+ [ --enable-macosx-qtcapture Mac OS X qtcapture (iSight) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_qtcapture}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_qtcapture}" = "yes")
+then
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,Cocoa])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QTKit])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreAudio])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,QuartzCore])
+ VLC_ADD_LDFLAGS([qtcapture], [-Wl,-framework,CoreVideo])
+ VLC_ADD_PLUGIN([qtcapture])
+fi
+
+AC_ARG_ENABLE(macosx-eyetv,
+ [ --enable-macosx-eyetv Mac OS X EyeTV (TNT Tuner) module (default enabled on Mac OS X)])
+if test "x${enable_macosx_eyetv}" != "xno" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_eyetv}" = "yes")
+then
+ VLC_ADD_LDFLAGS([access_eyetv], [-Wl,-framework,Foundation])
+ VLC_ADD_PLUGIN([access_eyetv])
+fi
+
+AC_ARG_ENABLE(macosx-vlc-app,
+ [ --enable-macosx-vlc-app build the VLC media player (default enabled on Mac OS X)])
+AM_CONDITIONAL(BUILD_MACOSX_VLC_APP, [test "${enable_macosx_vlc_app}" != "no" &&
+ (test "${SYS}" = "darwin" || test "${enable_macosx_vlc_app}" = "yes") ])
+
dnl
dnl ncurses module
dnl
AC_ARG_ENABLE(ncurses,
- [ --disable-ncurses ncurses interface support (default enabled)],
+ [ --disable-ncurses ncurses interface support (default disabled)],
[if test "${enable_ncurses}" != "no"; then
AC_CHECK_HEADER(ncurses.h,
[AC_CHECK_LIB(ncursesw, mvprintw,
PKG_ENABLE_MODULES_VLC([PROJECTM], [], [libprojectM], [projectM visualization plugin], [auto])
dnl
-dnl AtmoLight (homebrew AmbiLight)
+dnl AtmoLight (homemade Philips Ambilight clone)
dnl
AC_ARG_ENABLE(atmo,
-AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew Philips ambilight)
- (broken, default disabled)]),, [enable_atmo="no"])
+AS_HELP_STRING([--disable-atmo],[AtmoLight (homemade Philips Ambilight clone)
+ (default enabled)]),, [enable_atmo="yes"])
AS_IF([test "${enable_atmo}" != no], [
AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [
AC_LANG_PUSH(C++)
dnl libgcrypt
dnl
AC_ARG_ENABLE(libgcrypt,
- [ --disable-libgcrypt gcrypt support (default enabled)])
+ [ --disable-libgcrypt gcrypt support (default enabled)])
AS_IF([test "${enable_libgcrypt}" != "no"], [
AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [
libgcrypt-config --version >/dev/null || \
AC_ARG_ENABLE(gnutls,
[ --enable-gnutls gnutls TLS/SSL support (default enabled)])
+AS_IF([test "${have_libgcrypt}" != "yes"], [
+ AS_IF([test "${enable_gnutls}" = "yes"], [
+ AC_MSG_ERROR([--enable-gnutls and --disable-libgcrypt are mutually exclusive.])
+ ])
+ enable_gnutls="no"
+])
AS_IF([test "${enable_gnutls}" != "no"], [
PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.7.4], [
VLC_ADD_PLUGIN([gnutls])
VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
AS_IF([test "${SYS}" = "mingw32"], [
dnl pkg-config --libs gnutls omits these
- VLC_ADD_LIBS([gnutls], [-lz])
- VLC_ADD_LIBS([gnutls], [${LTLIBINTL}])
+ VLC_ADD_LIBS([gnutls], [-lz ${LTLIBINTL}])
])
dnl The GnuTLS plugin invokes gcry_control directly.
AS_IF([test "${have_libgcrypt}" = "yes"],[
AC_ARG_WITH(sqlite,
[ --with-sqlite=PATH sqlite path linking])
if test "${SYS}" != "darwin"; then
- PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3], [sqlite3], [auto])
+ PKG_ENABLE_MODULES_VLC([SQLITE], [], [sqlite3 >= 3.6.0], [sqlite3], [auto])
else
if test "${enable_sqlite}" != "no"
then
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],[\\\${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])
+ VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/libs/loader])
+ VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
+ VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
+ VLC_ADD_LIBS([dmo quicktime], [-lpthread])
])
AC_ARG_WITH(,[Components:])
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])
+ [ --with-wine-sdk-path=PATH path to wine sdk])
if test "${enable_activex}" != "no"
then
if test "${SYS}" = "mingw32"
AS_HELP_STRING([--enable-mozilla],[build a vlc-based Firefox/Mozilla plugin
(default disabled)]))
AC_ARG_WITH(mozilla-sdk-path,
- [ --with-mozilla-sdk-path=PATH path to mozilla sdk])
+ [ --with-mozilla-sdk-path=PATH path to mozilla sdk])
AC_ARG_WITH(mozilla-pkg,
- [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
+ [ --with-mozilla-pkg=PKG look for PKG.pc to build the mozilla plugin.])
AC_LANG_PUSH(C++)
if test "${enable_mozilla}" = "yes"
then
dnl this one is needed until automake knows what to do
VLC_ADD_LIBS([test3],[-lobjc])
- VLC_ADD_PLUGIN([test1])
- VLC_ADD_PLUGIN([test2])
- VLC_ADD_PLUGIN([test3])
- VLC_ADD_PLUGIN([test4])
-fi
-
-dnl
-dnl qte_main plugin
-dnl
-if test "${NEED_QTE_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([qte_main])
- VLC_ADD_CXXFLAGS([opie qte qt_video],[-DNEED_QTE_MAIN])
- VLC_ADD_CXXFLAGS([qte_main],[${CXXFLAGS_qte} ${CXXFLAGS_qt_video}])
- VLC_ADD_LDFLAGS([qte_main],[${LDFLAGS_qte} ${LDFLAGS_qt_video}])
+ VLC_ADD_PLUGIN([test1 test2 test3 test4])
fi
dnl
AC_SUBST(VERSION_EXTRA)
AC_SUBST(COPYRIGHT_YEARS)
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_COMPILE_HOST, "`hostname -f 2>/dev/null || hostname`", [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
projects/mozilla/npvlc_rc.rc
projects/mozilla/vlc.r
projects/mozilla/install.js
+ projects/mozilla/install.rdf
share/Makefile
- share/vlc_win32_rc.rc
- share/libvlc_win32_rc.rc
compat/Makefile
src/Makefile
src/test/Makefile
modules/access/dshow/Makefile
modules/access/dvb/Makefile
modules/access/mms/Makefile
- modules/access/cdda/Makefile
modules/access/rtp/Makefile
modules/access/rtsp/Makefile
modules/access/vcd/Makefile
modules/audio_output/Makefile
modules/codec/Makefile
modules/codec/avcodec/Makefile
- modules/codec/cmml/Makefile
modules/codec/dmo/Makefile
modules/codec/shine/Makefile
modules/codec/subtitles/Makefile
modules/demux/mpeg/Makefile
modules/demux/playlist/Makefile
modules/gui/Makefile
- modules/gui/beos/Makefile
modules/gui/macosx/Makefile
modules/gui/hildon/Makefile
modules/gui/minimal_macosx/Makefile
- modules/gui/qnx/Makefile
+ modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile
modules/gui/skins2/Makefile
- modules/gui/wince/Makefile
modules/meta_engine/Makefile
modules/misc/Makefile
modules/misc/dummy/Makefile
modules/misc/lua/Makefile
- modules/misc/memcpy/Makefile
modules/misc/notify/Makefile
modules/misc/testsuite/Makefile
modules/misc/playlist/Makefile
modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
- modules/video_output/qte/Makefile
modules/visualization/Makefile
modules/visualization/visual/Makefile
+ modules/mmx/Makefile
+ modules/mmxext/Makefile
+ modules/3dnow/Makefile
+ modules/sse2/Makefile
+ modules/altivec/Makefile
+ modules/arm_neon/Makefile
])
dnl Generate makefiles
USE_MAKE_OR_GMAKE=`case "${SYS}" in openbsd*) echo "gmake";; *) echo "make";; esac`
dnl Shortcut to nice compile message
rm -f compile
-echo '#! /bin/sh' >compile
+if test -n $SHELL; then
+ SHELL=${CONFIG_SHELL-/bin/sh}
+fi
+echo '#! '$SHELL >compile
echo rm -f .error\$\$ >>compile
echo ERROR=0 >>compile
echo export PATH=$PATH LANG=C >>compile
projects / vlc / blobdiff