AC_CANONICAL_BUILD
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(tar-ustar)
AM_CONFIG_HEADER(config.h)
dnl Too many people are not aware of maintainer mode:
VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([activex mozilla],[-lgdi32])
VLC_ADD_LIBS([cdda vcdx cddax sdl_image],[-lwinmm])
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl flac ts audioscrobbler lua],[-lws2_32])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp access_output_udp access_output_shout sap slp http stream_out_standard stream_out_rtp vod_rtsp access_realrtsp telnet rc netsync gnutls growl_udp flac ts audioscrobbler lua],[-lws2_32])
fi
if test "${SYS}" = "mingwce"; then
# add ws2 for closesocket, select, recv
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 libvlc growl],[-lbind -lsocket])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lbind -lsocket])
else
- VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl],[-lnet])
+ VLC_ADD_LIBS([access_file access_ftp access_mms access_output_udp telnet netsync sap libvlc growl_udp],[-lnet])
fi
dnl Ugly check for Zeta
dnl Gettext stuff
dnl
AM_GNU_GETTEXT_VERSION(0.16.1)
-AM_GNU_GETTEXT
-AS_IF([test "${nls_cv_force_use_gnu_gettext}" = "yes"], [
- AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, [Define if we use the local libintl])
- AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_builddir)/intl"
-], [
- VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
-])
+AM_GNU_GETTEXT([external])
+VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}])
dnl
dnl Iconv stuff
dnl
+AM_ICONV
AS_IF([test "$am_cv_func_iconv" != "yes"],
[AC_MSG_ERROR([libiconv is needed for VLC to work properly])])
VLC_ADD_CFLAGS([libvlc],[${INCICONV}])
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 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])
+AC_CHECK_FUNCS([gettimeofday strtod strtol strtof strtoll strtoull strsep isatty vasprintf asprintf swab sigrelse getpwuid 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])
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
AH_BOTTOM([#include <vlc_fixups.h>])
+AC_CHECK_FUNCS(mmap, [VLC_ADD_PLUGINS([access_mmap])])
+
AS_IF([test "${SYS}" = "linux"], [
AC_CHECK_FUNCS(tee)
])
AC_CHECK_FUNCS(send,,[
AC_CHECK_LIB(socket,send,[
- VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl],[-lsocket])
+ VLC_ADD_LIBS([access_http access_mms access_udp access_tcp access_ftp sap access_output_udp stream_out_standard growl_udp],[-lsocket])
])
])
AC_ARG_ENABLE(growl,
[ --enable-growl growl notification plugin (default enabled)])
AS_IF([test "${enable_growl}" != "no"], [
- VLC_ADD_PLUGINS([growl])
+ VLC_ADD_PLUGINS([growl_udp])
+ AC_CHECK_HEADERS(Growl/GrowlDefines.h, [
+ VLC_ADD_PLUGINS([growl])
+ VLC_ADD_LDFLAGS([growl], [-Wl,-framework,Growl,-framework,AppKit])
+ ])
]
)
AC_MSG_RESULT(yes)
VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
VLC_ADD_LIBS([x264],[-L${real_x264_tree}])
- LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
- AC_CHECK_LIB(x264, x264_encoder_open, [
- VLC_ADD_BUILTINS([x264])
- VLC_ADD_LIBS([x264],[-lx264])
+ PKG_CHECK_MODULES(X264,x264, [
+ VLC_ADD_PLUGINS([x264])
+ VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+ VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
],[
AC_MSG_ERROR([the specified tree hasn't been compiled])
])
AC_MSG_ERROR([the specified tree doesn't have x264.h])
fi
else
- LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
AC_CHECK_HEADERS(x264.h, [
- AC_CHECK_LIB(x264, x264_encoder_open, [
+ PKG_CHECK_MODULES(X264,x264, [
VLC_ADD_PLUGINS([x264])
- VLC_ADD_LIBS([x264],[-lx264])
+ VLC_ADD_LDFLAGS([x264],[${X264_LIBS}])
+ VLC_ADD_CFLAGS([x264],[${X264_CFLAGS}])
],[
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])
VLC_ADD_PLUGINS([telx])
])
+dnl
+dnl asa/csri subtitle rendering module
+dnl
+AC_ARG_ENABLE(csri,
+ [ --enable-csri Subtitle support using CSRI / asa (default disabled)])
+AS_IF( [test "${enable_csri}" = "yes"], [
+ PKG_CHECK_MODULES(CSRI,
+ csri >= 0.1.0,
+ [
+ VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS])
+ VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS])
+ VLC_ADD_PLUGINS([csri])
+ ],[
+ AC_MSG_WARN([CSRI helper library not found])
+ ])
+ ])
+
+dnl
+dnl asa demuxer
+dnl
+AC_ARG_ENABLE(asademux,
+ [ --enable-asademux asa subtitle demuxing (default disabled)])
+AS_IF( [test "${enable_asademux}" = "yes"], [
+ PKG_CHECK_MODULES(PCRE,
+ libpcre >= 6.5,
+ [
+ VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS])
+ VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS])
+ VLC_ADD_PLUGINS([asademux])
+ ],[
+ AC_MSG_WARN([PCRE library not found (required for asademux)])
+ ])
+ ])
+
dnl
dnl CMML plugin
dnl
fi
fi])
+dnl
+dnl Pulseaudio module
+dnl
+AC_ARG_ENABLE(pulse,
+ [ --enable-pulse Pulseaudio support (default enabled)])
+ if test "${enable_pulse}" != "no"
+ then
+ PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.8,
+ [ VLC_ADD_PLUGINS([pulse])
+ VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
+ VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])],
+ [AC_MSG_WARN(pulsaudio library not found)])
+ fi
+
dnl
dnl Portaudio module
dnl
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,QTKit])
VLC_ADD_LDFLAGS([macosx], [-Wl,-framework,WebKit])
VLC_ADD_LDFLAGS([opengllayer], [-Wl,-framework,QuartzCore])
- VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer], [-fobjc-exceptions] )
+ VLC_ADD_OBJCFLAGS([macosx minimal_macosx opengllayer growl], [-fobjc-exceptions] )
VLC_ADD_PLUGINS([access_eyetv])
VLC_ADD_BUILTINS([macosx minimal_macosx])
fi
fi
+dnl
+dnl AtmoLight (homebrew AmbiLight)
+dnl
+if test "${SYS}" = "mingw32" -o "${SYS}" = "linux"; then
+ AC_ARG_ENABLE(atmo,
+[ --disable-atmo AtmoLight (homebrew philips ambilight) (default enabled)])
+ if test "${enable_atmo}" != "no"; then
+ AC_LANG_PUSH(C++)
+ VLC_ADD_PLUGINS([atmo])
+ AC_LANG_POP(C++)
+ fi
+fi
+
dnl
dnl Bonjour services discovery
dnl
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_REVISION)
AC_DEFINE_UNQUOTED(VLC_COMPILE_BY, "`whoami`", [user who ran configure])
-if test "${SYS}" = "cygwin"
+if test "${build_os}" = "cygwin"
then
AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "`hostname`", [host which ran configure])
else
VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([
- vlc.win32.nsi
+ extras/package/win32/vlc.win32.nsi
Makefile
- activex/Makefile
- activex/axvlc.inf
+ projects/activex/Makefile
+ projects/activex/axvlc.inf
bindings/Makefile
bindings/java/Makefile
bindings/java/src/Makefile
bindings/python/Makefile
doc/Makefile
- intl/Makefile
- ipkg/Makefile
+ extras/package/ipkg/Makefile
libs/loader/Makefile
libs/srtp/Makefile
modules/Makefile
- mozilla/Makefile
+ projects/mozilla/Makefile
m4/Makefile
po/Makefile.in
share/Makefile
modules/stream_out/transrate/Makefile
modules/video_chroma/Makefile
modules/video_filter/Makefile
+ modules/video_filter/atmo/Makefile
modules/video_output/Makefile
modules/video_output/msw/Makefile
modules/video_output/qte/Makefile
echo '#! /bin/sh' >compile
echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile
-echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile
+echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/make.pl' >> compile
chmod a+x compile
printf "
projects / vlc / blobdiff