AC_PREREQ([2.69])
-AC_INIT([cinelerra], [5.1], [mail@lists.cinelerra-gg.org])
+AC_INIT([cinelerra],[5.1],[mail@lists.cinelerra-gg.org])
+
+# Put autogenerated stuff in subdir m4, which must be created
+# externally. This macro must be set before calling AC_INIT_AUTOMAKE
+AC_CONFIG_AUX_DIR(m4)
AM_INIT_AUTOMAKE([foreign])
AM_PROG_AS
-AC_LANG_CPLUSPLUS
-AC_LANG_C
+AC_LANG([C++])
+AC_LANG([C])
AC_PROG_CXX
CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros"
AC_DEFUN([CHECK_WITH], [
AC_ARG_WITH([$1],
- AC_HELP_STRING([--with-[$1]], [$2 ($4)]),
+ AS_HELP_STRING([--with-[$1]],[$2 ($4)]),
[WANT_$3=$withval], [WANT_$3='$4'])
AC_SUBST([WANT_$3])
])
AC_DEFUN([PKG_3RD],[
AC_ARG_ENABLE([$1],
- AC_HELP_STRING([--enable-$1],[build $1 ($2)]),
+ AS_HELP_STRING([--enable-$1],[build $1 ($2)]),
[PKG_$1=$enableval], [PKG_$1=$2])
PKG_DEF([$1],[$3],[$4],[$5])
])
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
- libavdevice/libavdevice.a \
libavformat/libavformat.a \
libswscale/libswscale.a \
libavfilter/libavfilter.a \
fi
PKG_3RD([fftw],[auto],
- [fftw-3.3.8],
+ [fftw-3.3.10],
[ .libs/libfftw3.a \
libbench2/libbench2.a \
rdft/scalar/r2cb/.libs/librdft_scalar_r2cb.a \
[ src/lib/openjp2 ])
PKG_3RD([libogg],[auto],
- [libogg-1.3.4],
+ [libogg-1.3.5],
[ src/.libs/libogg.a ],
[ include ])
# [])
#
PKG_3RD([tiff],[auto],
- [tiff-4.1.0],
+ [tiff-4.3.0],
[ libtiff/.libs/libtiff.a \
libtiff/.libs/libtiffxx.a \
port/.libs/libport.a ],[
[ . source ])
PKG_3RD([libvpx],[auto],
- [libvpx-1.8.2],
+ [libvpx-1.11.0],
[ libvpx.a ],
[ . ])
AC_DEFUN([CHECK_ENABLE], [
AC_ARG_ENABLE([$1],
- AC_HELP_STRING([--enable-[$1]], [$3 ([$4])]),
+ AS_HELP_STRING([--enable-[$1]],[$3 ([$4])]),
[WANT_$2=$enableval], [WANT_$2=[$4]])
])
RESULT=yes
# WANT_$1
AC_ARG_WITH(m4_tolower([$1]),
- AC_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))], [$3] (auto)),
+ AS_HELP_STRING([m4_join([-],[--with],m4_tolower([$1]))],[$3 (auto)]),
[WANT_$1=$withval],[WANT_$1=$2])
m4_quote($4)
if test "x$WANT_$1" = "xauto" ; then
OBJDIR=`uname -m`
AC_SUBST(OBJDIR)
-echo "AC_HELP_STRING([Reason],[Package])"
-echo "AC_HELP_STRING([------],[-------])"
+echo "AS_HELP_STRING([Reason],[Package])"
+echo "AS_HELP_STRING([------],[-------])"
AC_DEFUN([PKG_DISABLED],[
PKG_$1="no"
BUILD_$1=0
AC_SUBST(BUILD_$1)
- echo "AC_HELP_STRING([disabled],[$1])"
+ echo "AS_HELP_STRING([disabled],[$1])"
])
AC_DEFUN([PKG_SHARED],[
PKG_$1="shared"
BUILD_$1=1
AC_SUBST(BUILD_$1)
STATIC_BLDS+=" [$1]"
- echo "AC_HELP_STRING([$2],[$1])"
+ echo "AS_HELP_STRING([$2],[$1])"
fi
])
AC_SUBST(STATIC_BLDS)
for f in $SHARED_LIBS; do
- echo "AC_HELP_STRING([shared],[$f])"
+ echo "AS_HELP_STRING([shared],[$f])"
done
AC_SUBST(SHARED_LIBS)
for f in $SYSTEM_LIBS; do
- echo "AC_HELP_STRING([system],[$f])"
+ echo "AS_HELP_STRING([system],[$f])"
done
AC_SUBST(SYSTEM_LIBS)
if test [ "$(uname -o)"] = "Android" ; then
# termux
-EXTRA_LIBS+=' -liconv'
+EXTRA_LIBS+=' -liconv -landroid-shmem'
fi
# intel lock elision bugs