AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
-AC_DISABLE_STATIC
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-AC_ARG_ENABLE(libtool,
- [ --enable-libtool use libtool (default disabled)],
- [],[enable_libtool="no"])
-AM_CONDITIONAL(USE_LIBTOOL, [test "${enable_libtool}" != "no"])
-
dnl Check for compiler properties
AC_C_CONST
AC_C_INLINE
if test "`echo \"$topdir\" | cut -c 1`" != "/"; then
topdir="`pwd`/$topdir"
fi
- if test "`grep HOST ${topdir}/extras/contrib/config.mak |awk '{print $3}'`" != "`$CC -dumpmachine`"; then
+ if test "`grep HOST ${topdir}/extras/contrib/config.mak 2>/dev/null|awk '{print $3}'`" != "`$CC -dumpmachine`"; then
if test "${with_contrib}" = "yes"; then
AC_MSG_RESULT([no])
AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
;;
*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
AC_CHECK_TOOL(WINDRES, windres, :)
+ enable_libtool="no"
case "${target_os}" in
*mingw32*)
AM_CONDITIONAL(HAVE_WIN32, test "${SYS}" = "mingw32")
AM_CONDITIONAL(HAVE_WINCE, test "${SYS}" = "mingwce")
+dnl
+dnl Libtool
+dnl It's very bad, but our former custom system was worst
+dnl -- Courmisch
+dnl
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN
+dnl AC_LIBTOOL_WIN32_DLL - couldn't get libtool to work on Win32 so far
+AC_PROG_LIBTOOL
+
+AC_ARG_ENABLE(libtool,
+ [ --enable-libtool use libtool (default disabled)])
+AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"])
+
+
dnl
dnl Check for Mac OS X SDK settings
dnl
VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flac])
VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flacdec])
VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32])
-VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32])
+VLC_ADD_PLUGINS([fixed32tos16 s16tofixed32 u8tofixed32 mono])
VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])
VLC_ADD_PLUGINS([trivial_channel_mixer trivial_mixer])
VLC_ADD_PLUGINS([playlist export sgimb nsc xtag])
if test "${SYS}" != "mingwce"; then
dnl VLC_ADD_PLUGINS([externrun])
VLC_ADD_PLUGINS([access_fake access_filter_timeshift access_filter_record])
- VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake motion])
+ VLC_ADD_PLUGINS([gestures rc telnet hotkeys netsync showintf time marq podcast shout sap fake])
VLC_ADD_PLUGINS([rss mosaic wall motiondetect clone crop])
VLC_ADD_PLUGINS([i420_yuy2 i422_yuy2 i420_ymga])
VLC_ADD_PLUGINS([aout_file linear_resampler bandlimited_resampler])
dnl Some plugins aren't useful on some platforms
dnl
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
- VLC_ADD_PLUGINS([screensaver])
+ VLC_ADD_PLUGINS([screensaver motion])
elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGINS([ntservice access_smb dmo msn])
VLC_ADD_LDFLAGS([dmo],[-lole32])
dnl
AC_ARG_WITH(tuning,
[ --with-tuning=ARCH enable special tuning for an architecture
- (default Pentium 2 on IA-32 and 750 on PPC)])
+ (default Pentium 2 on IA-32 and G4 on PPC)])
if test -n "${with_tuning}"; then
if test "${with_tuning}" != "no"; then
CFLAGS_TUNING="-mtune=${with_tuning}"
elif test "${target_cpu}" = "x86_64"; then
CFLAGS_TUNING="-mtune=athlon64"
elif test "${target_cpu}" = "powerpc"; then
- CFLAGS_TUNING="-mtune=750";
+ CFLAGS_TUNING="-mtune=G4";
fi
fi
VLC_ADD_PLUGINS([stream_out_dummy stream_out_standard stream_out_es stream_out_rtp stream_out_description vod_rtsp])
VLC_ADD_PLUGINS([stream_out_duplicate stream_out_gather stream_out_display stream_out_transcode stream_out_bridge stream_out_mosaic_bridge])
# VLC_ADD_PLUGINS([stream_out_transrate])
+ VLC_ADD_PLUGINS([profile_parser])
AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
fi
PKG_CHECK_MODULES(SHOUT, shout >= 2.1,
[AC_DEFINE(HAVE_SHOUT, [], [Define if you have the libshout library])
VLC_ADD_PLUGINS([access_output_shout])
- VLC_ADD_LDFLAGS([vlc access_output_shout],[$SHOUT_LIBS])
- VLC_ADD_CFLAGS([vlc access_output_shout],[$SHOUT_CFLAGS])],
+ VLC_ADD_LDFLAGS([access_output_shout],[$SHOUT_LIBS])
+ VLC_ADD_CFLAGS([access_output_shout],[$SHOUT_CFLAGS])],
[AC_MSG_WARN(libshout library not found)])
fi
AC_CHECK_HEADERS(dvbpsi/dr.h,
[ VLC_ADD_PLUGINS([ts])
if test "${enable_sout}" != "no"; then
- VLC_ADD_BUILTINS([mux_ts])
+ VLC_ADD_PLUGINS([mux_ts])
fi
VLC_ADD_LDFLAGS([mux_ts ts dvb],[-ldvbpsi]) ],
[ AC_MSG_WARN([cannot find libdvbpsi headers]) ],
CPPFLAGS="${CPPFLAGS_save}"
fi
+dnl
+dnl Video4Linux plugin
+dnl
+AC_ARG_ENABLE(v4l2,
+ [ --enable-v4l2 Video4Linux2 input support (default disabled)])
+if test "${enable_v4l2}" = "yes"
+then
+ AC_ARG_WITH(v4l2,
+ [ --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])
+ fi
+
+ CPPFLAGS="${CPPFLAGS_save} ${CPPFLAGS_v4l2}"
+ AC_CHECK_HEADERS(linux/videodev2.h, [
+ VLC_ADD_PLUGINS([v4l2])
+ ],[])
+ CPPFLAGS="${CPPFLAGS_save}"
+fi
+
+
dnl
dnl special access module for Hauppauge PVR cards
dnl
then
AC_CHECK_HEADERS(theora/theora.h, [
AC_CHECK_LIB(theora, theora_granule_time, [
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_PLUGINS([theora])
- else
- VLC_ADD_BUILTINS([theora])
- fi
+ VLC_ADD_PLUGINS([theora])
theora_libs="-ltheora -logg"
VLC_ADD_LDFLAGS([theora],[${theora_libs}]) ],[
AC_MSG_ERROR([libtheora doesn't appear to be installed on your system.
AC_CHECK_HEADERS(ddraw.h,
[ VLC_ADD_PLUGINS([vout_directx aout_directx])
VLC_ADD_LDFLAGS([vout_directx],[-lgdi32])
- dnl to be moved when dependance is removed
- AC_CHECK_HEADERS(GL/gl.h, [
- VLC_ADD_PLUGINS([glwin32])
- VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
- ]) ])
+ ])
+ AC_CHECK_HEADERS(GL/gl.h,
+ [ VLC_ADD_PLUGINS([glwin32])
+ VLC_ADD_LDFLAGS([glwin32],[-lopengl32 -lgdi32])
+ ])
+ AC_CHECK_HEADERS(d3d9.h,
+ [ VLC_ADD_PLUGINS([direct3d])
+ VLC_ADD_LDFLAGS([direct3d],[-ld3d9 -lgdi32])
+ ])
else
AC_MSG_CHECKING(for directX headers in ${with_directx})
if test -f ${with_directx}/ddraw.h
[if test "${enable_qt4}" = "yes"; then
PKG_CHECK_MODULES(QT4, QtCore QtGui,
[ VLC_ADD_PLUGINS([qt4])
- enableqt4=true
+ ALIASES="${ALIASES} qvlc"
+ enableqt4=true
VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
then
VLC_ADD_BUILTINS([macosx])
VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
fi],
[AC_CHECK_HEADERS(Cocoa/Cocoa.h,
VLC_ADD_BUILTINS([macosx])
VLC_ADD_LDFLAGS([macosx],[-framework IOKit -framework Cocoa -framework Carbon -framework QuickTime -lobjc -ObjC -framework OpenGL -framework AGL])
+ VLC_ADD_OBJCFLAGS( [macosx],[-fobjc-exceptions] )
)])
CFLAGS=$ORIGCFLAGS
[ --enable-gnutls gnutls TLS/SSL support (default enabled)])
AS_IF([test "${enable_gnutls}" != "no"], [
- gcrypt_LIBS="-lgpg-error"
- AS_IF([test "${SYS}" = "mingw32"], [
- gcrypt_LIBS="${gcrypt_LIBS} -lws2_32"
- VLC_ADD_LDFLAGS([gnutls],[-lws2_32])
- ])
-
- gnutls_LIBS="-lgcrypt -lz ${gcrypt_LIBS}"
-
- AC_CHECK_HEADER(gcrypt.h, [
- AC_CHECK_LIB(gcrypt, gcry_control, [
- AC_CHECK_HEADER(gnutls/gnutls.h, [
- AC_CHECK_LIB(gnutls, gnutls_certificate_verify_peers2,
- [have_gnutls="yes"],[old_gnutls="yes"],[${gnutls_LIBS}])
- ])
- ],,[${gcrypt_LIBS}])
- ])
+ PKG_CHECK_MODULES(GNUTLS, [gnutls >= 1.0.17], [have_gnutls="yes"], [have_gnutls="no"])
AS_IF([test "${have_gnutls}" = "yes"], [
VLC_ADD_PLUGINS([gnutls])
- VLC_ADD_LDFLAGS([gnutls], [-lgnutls ${gnutls_LIBS}])
+ VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
+ VLC_ADD_LDFLAGS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
AC_MSG_ERROR([gnutls not present or too old (version 1.0.17 required)])
dnl
AC_ARG_ENABLE(java-bindings,
[ --enable-java-bindings Enable Java bindings (default disabled)])
-if test "${enable-java-bindings}" = "yes"
+if test "${enable_java_bindings}" = "yes"
then
- AC_PROG_JAVA_CC(javac)
+ AS_IF([test "x${JAVA_HOME}" == "x"],
+ [AC_MSG_ERROR([Please set the JAVA_HOME variable to your JDK environment])])
AC_PROG_JAVAC
AC_PROG_JAVA
fi
AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
FILE_LIBVLC_DLL="" )
+dnl
+dnl we need pic on amd64 fo the mozilla plugin
+
+case "${target_cpu}" in
+ x86_64)
+ pic=pic
+ ;;
+ *)
+ pic=""
+ ;;
+esac
+AC_SUBST(pic)
+
dnl Import conditional variables generated by bootstrap
VLC_CONDITIONALS
activex/axvlc.inf
bindings/Makefile
bindings/java/Makefile
+ bindings/java/src/Makefile
bindings/mediacontrol-python/Makefile
doc/Makefile
intl/Makefile
projects / vlc / blobdiff