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],[-lwinmm])
+ 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],[-lws2_32])
VLC_ADD_LIBS([access_file], [-lshlwapi])
fi
then
AC_CHECK_LIB(mingwex,opendir,
AC_CHECK_LIB(mingw32,opendir,,
- [VLC_ADD_LIBS([libvlccore gtk],[-lmingwex])])
+ [VLC_ADD_LIBS([libvlccore],[-lmingwex])])
)
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 lrintf daemon fork lstat posix_fadvise posix_madvise uselocale])
+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_FUNC_ALLOCA
AC_CHECK_FUNCS(fcntl)
-AC_REPLACE_FUNCS([asprintf atof atoll getcwd gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
+AC_REPLACE_FUNCS([asprintf atof atoll getcwd getpid gmtime_r lldiv localtime_r rewind strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtoll vasprintf swab])
AC_CHECK_FUNCS([stricmp strnicmp])
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 fstatfs])
+AC_CHECK_FUNCS([vmsplice eventfd fstatfs])
AH_BOTTOM([#include <vlc_fixups.h>])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_TYPE_SIGNAL
AC_CHECK_LIB(m,cos,[
- VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene],[-lm])
+ VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua],[-lm])
])
AC_CHECK_LIB(m,pow,[
VLC_ADD_LIBS([avcodec avformat swscale postproc ffmpegaltivec i420_rgb faad twolame equalizer spatializer param_eq libvlccore freetype mod mpc dmo quicktime realaudio realvideo opengl],[-lm])
AC_CHECK_LIB(m,round,[
VLC_ADD_LIBS([dbus],[-lm])
])
-AC_CHECK_LIB(mx,sqrtf,[
- VLC_ADD_LIBS([x264],[-lmx])
+AC_CHECK_LIB(m,sqrtf,[
+ VLC_ADD_LIBS([x264],[-lm])
])
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
+AC_CHECK_LIB(m,lrintf, [
+ AC_DEFINE(HAVE_LRINTF, 1, [Define to 1 if you have the lrintf function])
+ VLC_ADD_LIBS([skins2],[-lm])
+])
+
dnl Check for dynamic plugins
ac_cv_have_plugins=no
ac_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlccore realaudio realvideo],[-ldl]),
+ VLC_ADD_LIBS([libvlccore realaudio realvideo lua],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlccore],[-lsvld]))))
])
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
AC_CHECK_HEADERS(machine/param.h sys/shm.h)
-AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h])
+AC_CHECK_HEADERS([linux/version.h linux/dccp.h scsi/scsi.h linux/magic.h])
AC_CHECK_HEADERS(syslog.h)
fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
dnl Check for poll
AC_SEARCH_LIBS(poll, [poll], [AC_DEFINE(HAVE_POLL, 1, [Define to 1 if the OS is usabl... err, has poll().])], [
-if test ${SYS} != "mingw32"
+if test ${SYS} != "mingw32" -a ${SYS} != "mingwce"
then
AC_MSG_WARN([Your platform does not support poll(). VLC has it's own poll() implementation, but it is only intended to be used on Windows. VLC might crash or be insecure when you see this message. Either switch to an OS with a proper poll() implementation, or implement one for your OS in VLC])
fi
;;
esac
-dnl Build the gtk_main plugins?
-NEED_GTK_MAIN=no
-NEED_GNOME_MAIN=no
-NEED_GTK2_MAIN=no
-NEED_GNOME2_MAIN=no
-
dnl build the qte plugin ?
NEED_QTE_MAIN=no
CFLAGS="${CFLAGS_save}"
RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast cast-align write-strings missing-prototypes volatile-register-var error-implicit-function-declaration])
-RDC_PROG_CC_FLAGS_IFELSE([-pipe])
+RDC_PROG_CC_FLAGS([-pipe])
AC_ARG_ENABLE(warnings-as-error,
- AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default disabled, enabled in debug)]))
-if test "x${warnings_as_error}" = "xyes" -o "x${enable_debug}" != "xno"
-then
+ AS_HELP_STRING([--enable-warnings-as-error],[Treat acceptable warnings as error (default in debug)]),, [enable_warnings_as_error="$enable_debug"])
+AS_IF([test "${enable_warnings_as_error}" = "yes"], [
RDC_PROG_CC_WERRORFLAGS([unused-function unused-label unused-value unused-parameter unused-variable unused \
- missing-parameter-type missing-declarations undef address enum-compare implicit-int implicit-function-declaration \
- comment format format-security format-nonliteral main missing-braces nonnull parentheses pointer-sign reorder return-type sequence-point switch trigraphs uninitialized \
- bad-function-cast end])
-fi
+ missing-braces nonnull parentheses uninitialized address enum-compare undef comment switch \
+ bad-function-cast implicit sequence-point strict-aliasing array-bounds missing-parameter-type \
+ overflow int-to-pointer-cast pointer-to-int-cast div-by-zero overflow ignored])
+])
+AC_SUBST(CFLAGS_WERROR)
dnl Check for various optimization flags
AC_CACHE_CHECK([if \$CC accepts -Os],
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])
dnl
dnl libproxy support
dnl
-PKG_ENABLE_MODULES_VLC([LIBPROXY], [], [libproxy-1.0], [libproxy support], [auto])
+AC_ARG_ENABLE(libproxy,
+ [ --enable-libproxy libproxy support (default auto)])
+AS_IF([test "${enable_libproxy}" != "no"], [
+ PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0, [
+ AC_DEFINE(HAVE_LIBPROXY, 1, [Define if libproxy is available])
+ VLC_ADD_CFLAGS([access_http],[$LIBPROXY_CFLAGS])
+ VLC_ADD_LIBS([access_http],[$LIBPROXY_LIBS])
+ ], [
+ AS_IF([test "x${enable_libproxy}" != "x"], [
+ AC_MSG_ERROR([libproxy could not be found on your system])
+ ])
+ ])
+])
dnl
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++)
- else
+ else
dnl No opencv could be found, sorry
AC_MSG_RESULT(no)
AC_MSG_ERROR([cannot find opencv in ${with_opencv_tree}])
- fi
+ fi
else
PKG_CHECK_MODULES(OPENCV, opencv,
[
PKG_ENABLE_MODULES_VLC([OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
if test "${enable_sout}" != "no"; then
PKG_ENABLE_MODULES_VLC([MUX_OGG], [], [ogg >= 1.0], [Ogg demux support], [auto])
+else
+ AM_CONDITIONAL(HAVE_MUX_OGG, 0)
fi
if test "${enable_sout}" != "no"; then
dnl Check for libshout
PKG_ENABLE_MODULES_VLC([shout], [access_output_shout], [shout >= 2.1], [libshout output plugin], [auto])
+else
+ AM_CONDITIONAL(HAVE_shout, 0)
fi
dnl
dnl libxcb
PKG_CHECK_MODULES(XCB, [xcb])
PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
- VLC_ADD_PLUGIN([xcb])
+ VLC_ADD_PLUGIN([xcb_x11])
VLC_ADD_PLUGIN([xcb_screen])
AS_IF([test "${enable_xvideo}" != "no"], [
if test "${SDL_CONFIG}" != "no"
then
# SDL on Darwin is heavily patched and can only run SDL_image
- if test "${SYS}" != "darwin" -a "${SYS}" != "mingw32"; then
+ if test "${SYS}" != "darwin"; then
VLC_ADD_PLUGIN([vout_sdl])
VLC_ADD_PLUGIN([aout_sdl])
fi
dnl
dnl libxml2 module
dnl
-PKG_ENABLE_MODULES_VLC([libxml2], [], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
+PKG_ENABLE_MODULES_VLC([libxml2], [xml], [libxml-2.0 >= 2.5], [libxml2 support],[auto])
dnl
dnl SVG module
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])
dnl
dnl win32 waveOut plugin
(test "${SYS}" != "darwin" && test "${SYS}" != "beos" &&
test "${SYS}" != "mingwce" && test "${enable_skins2}" != "no")])
-dnl
-dnl PDA Gtk+2 module
-dnl
-AC_ARG_ENABLE(pda,
- [ --enable-pda PDA interface needs Gtk2 support (default disabled)])
-if test "${enable_pda}" = "yes"
-then
- PKG_CHECK_MODULES(GTK2, [gtk+-2.0 >= 2.0.0, gthread-2.0])
- VLC_ADD_CFLAGS([gtk2],[${GTK2_CFLAGS}])
- VLC_ADD_LIBS([gtk2],[${GTK2_LIBS}])
- VLC_ADD_CFLAGS([pda],[${GTK2_CFLAGS} ${CFLAGS_pda}])
- VLC_ADD_LIBS([pda],[${LDFLAGS_pda}])
- VLC_ADD_LIBS([pda],[${GTK2_LIBS}])
- VLC_ADD_PLUGIN([pda])
- if test "${SYS}" != "mingw32"; then
- NEED_GTK2_MAIN=yes
- VLC_ADD_CFLAGS([gtk2_main],[$GTK2_CFLAGS])
- VLC_ADD_LIBS([gtk2_main],[$GTK2_LIBS])
- fi
-fi
-AM_CONDITIONAL(BUILD_PDA, [test "${enable_pda}" = "yes"])
-
dnl
dnl Maemo
dnl
dnl
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)
- (default enabled)]))
- if test "${enable_atmo}" != "no"; then
- AC_LANG_PUSH(C++)
- VLC_ADD_PLUGIN([atmo])
- AC_LANG_POP(C++)
- fi
-fi
+AC_ARG_ENABLE(atmo,
+AS_HELP_STRING([--disable-atmo],[AtmoLight (homebrew Philips ambilight)
+ (broken, default disabled)]),, [enable_atmo="no"])
+AS_IF([test "${enable_atmo}" != no], [
+ AS_IF([test "${SYS}" = "mingw32" -o "${SYS}" = "linux"], [
+ AC_LANG_PUSH(C++)
+ VLC_ADD_PLUGIN([atmo])
+ AC_LANG_POP(C++)
+ ])
+])
dnl
dnl Bonjour services discovery
VLC_ADD_LIBS([gnutls], [$GNUTLS_LIBS])
], [
AS_IF([test "${enable_gnutls}" = "yes"], [
- AC_MSG_ERROR([gnutls not present or too old (version 1.2.9 required)])
+ AC_MSG_ERROR([gnutls not present or too old (version 1.7.4 required)])
])
])
])
VLC_ADD_PLUGIN([test4])
fi
-dnl
-dnl gtk_main plugin
-dnl
-if test "${NEED_GTK_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gtk_main])
- VLC_ADD_CFLAGS([gtk_main],[${CFLAGS_gtk}])
- VLC_ADD_LDFLAGS([gtk_main],[${LDFLAGS_gtk}])
-fi
-
-if test "${NEED_GNOME_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gnome_main])
- VLC_ADD_CFLAGS([gnome_main],[${CFLAGS_gtk} ${CFLAGS_gnome}])
- VLC_ADD_LDFLAGS([gnome_main],[${LDFLAGS_gtk} ${LDFLAGS_gnome}])
-fi
-
-if test "${NEED_GTK2_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gtk2_main])
- VLC_ADD_CFLAGS([gtk2],[-DNEED_GTK2_MAIN])
- VLC_ADD_CFLAGS([pda],[-DNEED_GTK2_MAIN])
- VLC_ADD_CFLAGS([gtk2_main],[${CFLAGS_gtk2} ${CFLAGS_pda}])
- VLC_ADD_LDFLAGS([gtk2_main],[${LDFLAGS_gtk2} ${LDFLAGS_pda}])
-fi
-
-if test "${NEED_GNOME2_MAIN}" != "no"
-then
- VLC_ADD_PLUGIN([gnome2_main])
- VLC_ADD_CFLAGS([gnome2_main],[${CFLAGS_gtk2} ${CFLAGS_gnome2}])
- VLC_ADD_LDFLAGS([gnome2_main],[${LDFLAGS_gtk2} ${LDFLAGS_gnome2}])
-fi
-
dnl
dnl qte_main plugin
dnl
modules/access/cdda/Makefile
modules/access/rtp/Makefile
modules/access/rtsp/Makefile
- modules/access/rtmp/Makefile
modules/access/vcd/Makefile
modules/access/vcdx/Makefile
modules/access/screen/Makefile
modules/demux/playlist/Makefile
modules/gui/Makefile
modules/gui/beos/Makefile
- modules/gui/pda/Makefile
modules/gui/macosx/Makefile
modules/gui/maemo/Makefile
modules/gui/minimal_macosx/Makefile
modules/stream_out/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
- modules/video_filter/atmo/Makefile
modules/video_filter/dynamicoverlay/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
projects / vlc / blobdiff