- Require automake 1.9 to fix some libtool plugin build problems
- Remove useless libs/Makefile
# - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
# - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it
-SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc
-DIST_SUBDIRS = $(SUBDIRS) ipkg
+SUBDIRS = intl po libs/loader libs/srtp src modules . \
+ mozilla bindings activex share doc
+DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
# Check for automake
amvers="no"
# Check for automake
amvers="no"
-for v in "-1.10" "110" "-1.9" "19" "-1.8" "18" "-1.7" "17"; do
+for v in "-1.10" "110" "-1.9" "19"; do
if automake${v} --version >/dev/null 2>&1; then
amsuff="${v}"
amvers="`echo ${v} | sed -e 's/^-//'`"
if automake${v} --version >/dev/null 2>&1; then
amsuff="${v}"
amvers="`echo ${v} | sed -e 's/^-//'`"
- no|1.[0123456]|1.[0123456].*|1[0123456]|1.[0123456]-*)
+ no|1.[012345678]|1.[0123456].*|1[0123456]|1.[0123456]-*)
- echo "$0: you need automake version 1.7 or later"
+ echo "$0: you need automake version 1.9 or later"
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Grishenko"
CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Grishenko"
+AC_PREREQ(2.59) dnl this really should be 2.59c
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CONFIG_SRCDIR(src/libvlc.c)
AC_CONFIG_AUX_DIR(autotools)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([1.7 check-news dist-bzip2])
+AM_INIT_AUTOMAKE([1.9 check-news dist-bzip2 no-dist-gzip -Wall])
AM_CONFIG_HEADER(config.h)
dnl Too many people are not aware of maintainer mode:
AM_CONFIG_HEADER(config.h)
dnl Too many people are not aware of maintainer mode:
AS_IF([test "x${enable_maintainer_mode}" != "xno"],
[enable_maintainer_mode="yes"])
AS_IF([test "x${enable_maintainer_mode}" != "xno"],
[enable_maintainer_mode="yes"])
doc/Makefile
intl/Makefile
ipkg/Makefile
doc/Makefile
intl/Makefile
ipkg/Makefile
libs/loader/Makefile
libs/srtp/Makefile
modules/Makefile
libs/loader/Makefile
libs/srtp/Makefile
modules/Makefile