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:
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])
+ AC_MSG_ERROR([ not using the libs in extras/contrib as it is not the same host])
else
AC_MSG_RESULT([no])
- AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
+ AC_MSG_WARN([ not using the libs in extras/contrib as it is not the same host])
fi
else
if test -d ${topdir}/extras/contrib/lib; then
case "${build_os}" in
cygwin|msys)
ac_executable_extensions=".exe"
- ;;
+ ;;
*)
- ;;
+ ;;
esac
dnl
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 mmap])
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_cv_my_have_dlopen=yes,
AC_CHECK_LIB(dl, dlopen,
ac_cv_my_have_dlopen=yes
- VLC_ADD_LIBS([libvlc],[-ldl]),
+ VLC_ADD_LIBS([libvlc realaudio],[-ldl]),
AC_CHECK_LIB(svld, dlopen,
ac_cv_my_have_dlopen=yes
VLC_ADD_LIBS([libvlc],[-lsvld]))))
[
VLC_ADD_PLUGINS([notify])
VLC_ADD_CFLAGS(notify, [$NOTIFY_CFLAGS])
- VLC_ADD_LIBS(notify, [$NOTIFY_LIBS])
+ VLC_ADD_LIBS(notify, [$NOTIFY_LIBS])
],[
- AS_IF([test "${enable_notify}" = "yes"],[
- AC_MSG_WARN( libnotify not found) ])
+ AS_IF([test "${enable_notify}" = "yes"],[
+ AC_MSG_WARN( libnotify not found) ])
])
])
[ --enable-musicbrainz MusicBrainz support (default disabled) ])
AS_IF([test "${enable_musicbrainz}" = "yes"],[
PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
- [ VLC_ADD_PLUGINS([musicbrainz])
- VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
- VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
+ [ VLC_ADD_PLUGINS([musicbrainz])
+ VLC_ADD_LIBS([musicbrainz],[$MUSICBRAINZ_LIBS])
+ VLC_ADD_CFLAGS([musicbrainz],[$MUSICBRAINZ_CFLAGS]) ],
[AC_MSG_WARN(MusicBrainz library not found)])
])
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}" != "no"], [
+ 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}" != "no"], [
+ 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
[ --enable-fribidi fribidi support (default enabled)])
if test "${enable_freetype}" != "no"
then
- FREETYPE_PATH="${PATH}"
- AC_ARG_WITH(freetype-config-path,
- [ --with-freetype-config-path=PATH freetype-config path (default search in \$PATH)],
- [ if test "${with_freetype_config_path}" != "no"
- then
- FREETYPE_PATH="${with_freetype_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no, ${FREETYPE_PATH})
-
- if test "${FREETYPE_CONFIG}" != "no"
- then
- VLC_ADD_PLUGINS([freetype])
- VLC_ADD_CFLAGS([freetype],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LIBS([freetype],[`${FREETYPE_CONFIG} --libs`])
- if test "${SYS}" = "mingw32"; then
- VLC_ADD_LIBS([freetype],[-lxml2])
- fi
+ PKG_CHECK_MODULES(FREETYPE, freetype2,[
+ VLC_ADD_PLUGINS([freetype])
+ have_freetype=yes
+ VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
+ VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
+ if test "${SYS}" = "mingw32"; then
+ VLC_ADD_LIBS([freetype skins2],[-lxml2])
+ fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h,
- [VLC_ADD_CFLAGS([freetype],[-DHAVE_FONTCONFIG])
+ [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LIBS([freetype],[-lfontconfig])])
AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
- elif test "${enable_freetype}" = "yes"
- then
+ ],[
+ have_freetype=no
+ AS_IF([ test "${enable_freetype}" = "yes"],[
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
+ ])
])
- fi
+ ])
dnl fribidi support
if test "${enable_fribidi}" != "no"
then
- FRIBIDI_PATH="${PATH}"
- AC_ARG_WITH(fribidi-config-path,
- [ --with-fribidi-config-path=PATH fribidi-config path (default search in \$PATH)],
- [ if test "${with_fribidi_config_path}" != "no"
- then
- FRIBIDI_PATH="${with_fribidi_config_path}:${PATH}"
- fi ])
- AC_PATH_PROG(FRIBIDI_CONFIG, fribidi-config, no, ${FRIBIDI_PATH})
-
- if test "${FRIBIDI_CONFIG}" != "no"
- then
- VLC_ADD_CFLAGS([freetype], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
- VLC_ADD_CPPFLAGS([skins2], [`${FRIBIDI_CONFIG} --cflags` -DHAVE_FRIBIDI])
- VLC_ADD_LIBS([freetype], [`${FRIBIDI_CONFIG} --libs`])
- VLC_ADD_LIBS([skins2], [`${FRIBIDI_CONFIG} --libs`])
+ PKG_CHECK_MODULES(FRIBIDI, fribidi, [
+ VLC_ADD_CPPFLAGS([freetype skins2], [${FRIBIDI_CFLAGS} -DHAVE_FRIBIDI])
+ VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
+ ])
fi
- fi
fi
dnl
skins2_missing_lib="no"
dnl freetype
- if test "${FREETYPE_CONFIG}" != "no"; then
- VLC_ADD_CPPFLAGS([skins2],[`${FREETYPE_CONFIG} --cflags`])
- VLC_ADD_LIBS([skins2],[`${FREETYPE_CONFIG} --libs`])
- else
+ if test "${have_freetype}" != "yes"; then
skins2_missing_lib="yes"
if test "${enable_skins2}" = "yes"; then
AC_MSG_ERROR([Could not find freetype (required for skins2)])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc"
enableqt4=true
- VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce" -a "${SYS}" != "cygwin" -a "${SYS}" != "darwin"; then
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS -lX11])
+ else
+ VLC_ADD_LIBS([qt4],[$QT4_LIBS])
+ fi
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS -DQT4LOCALEDIR=\\\\\\\"$($PKG_CONFIG --variable=prefix QtCore)/share/qt4/translations/\\\\\\\"])
AC_PATH_PROGS(MOC, [moc-qt4 moc], moc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
AC_PATH_PROG(RCC, rcc, rcc,`$PKG_CONFIG --variable=exec_prefix QtCore`/bin)
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 -ldl -lpthread])
+ VLC_ADD_LIBS([realaudio],[../../libs/loader/libloader.la])
])
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
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