CONFIGURE_LINE="`echo "$0 $ac_configure_args" | sed -e 's/\\\/\\\\\\\/g'`"
CODENAME="Grishenko"
-AC_PREREQ(2.59)
+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
-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:
AS_IF([test "x${enable_maintainer_mode}" != "xno"],
[enable_maintainer_mode="yes"])
-
-dnl HA! HA!
AM_MAINTAINER_MODE
dnl
dnl Check for dbus
AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)])
-
-if test "${enable_dbus}" != "no" -a "$SYS" = "Linux"
+
+if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
then
dnl api stable dbus
PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0.0,
LDFLAGS="${LDFLAGS_save} ${LDFLAGS_ffmpeg}"
AC_CHECK_HEADERS(ffmpeg/avcodec.h, [], [AC_MSG_ERROR([Missing header file ffmpeg/avcodec.h.])] )
AC_CHECK_HEADERS(ffmpeg/avformat.h)
- AC_CHECK_HEADERS(ffmpeg/swscale.h)
AC_CHECK_HEADERS(ffmpeg/avutil.h)
AC_CHECK_HEADERS(postproc/postprocess.h, [], [AC_MSG_ERROR([Missing header file postproc/postprocess.h.])] )
CPPFLAGS="${CPPFLAGS_save}"
AC_CHECK_LIB(swscale, sws_getContext, [
+ AC_CHECK_HEADERS(ffmpeg/swscale.h)
VLC_ADD_LDFLAGS([ffmpeg],[-lswscale]) ], [], [-lavcodec $LDAVUTIL])
LDFLAGS="${LDFLAGS_save}"
CPPFLAGS="${CPPFLAGS_save}"
])
])
+AM_PATH_LIBGCRYPT([1:1.1.94], [have_libgcrypt="yes"], [have_libgcrypt="no"])
+AM_CONDITIONAL([HAVE_LIBGCRYPT], [test "${have_libgcrypt}" = "yes"])
+
dnl
dnl Endianness check, AC_C_BIGENDIAN doesn't work if we are cross-compiling
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGINS([dmo])
- VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader])
- VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader])
- VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la -lpthread])
- VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER])
- VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la -ldl -lpthread])
+ VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader])
+ VLC_ADD_LDFLAGS([dmo],[../../../libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
+ VLC_ADD_LDFLAGS([quicktime],[../../libs/loader/libloader.la -lpthread])
+ VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
+ VLC_ADD_LDFLAGS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread])
])
dnl
doc/Makefile
intl/Makefile
ipkg/Makefile
- loader/Makefile
+ libs/loader/Makefile
+ libs/srtp/Makefile
modules/Makefile
mozilla/Makefile
m4/Makefile