AC_PREREQ([2.69])
-AC_INIT([cinelerra], [5.1], [mail@lists.cinelerra-cv.org])
+AC_INIT([cinelerra], [5.1], [mail@lists.cinelerra-gg.org])
AM_INIT_AUTOMAKE([foreign])
AM_PROG_AS
CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid"
CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
+CFG_LDFLAGS+=" -z noexecstack"
+
AC_DEFUN([CHECK_WITH], [
AC_ARG_WITH([$1],
AC_HELP_STRING([--with-[$1]], [$2 ($4)]),
CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
+CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes])
if test "x$WANT_LV2" != "xno"; then
GTK2_LIBS=`pkg-config --libs gtk+-2.0`
[ . ])
PKG_3RD([ffmpeg],[yes],
- [ffmpeg-4.0],
+ [ffmpeg-4.1],
[ libavutil/libavutil.a \
libavcodec/libavcodec.a \
libpostproc/libpostproc.a \
[ libtwolame ])
PKG_3RD([x264],[auto],
- [x264-snapshot-20180118-2245],
+ [x264-snapshot-20190117-2245-stable],
[ libx264.a ],
[ . ])
PKG_3RD([x265],[auto],
- [x265_2.8],
+ [x265_2.9],
[ libx265.a ],
[ . source ])
fi
for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
- COMMERCIAL LIBZMPEG; do
+ COMMERCIAL LIBZMPEG SHUTTLE; do
eval vv="\$WANT_$v"
if test "x$vv" != "xno"; then
CFG_CFLAGS+=" -DHAVE_$v"
echo " using: with-booby = $WANT_BOOBY"
echo " using: with-libzmpeg = $WANT_LIBZMPEG"
echo " using: with-commerical = $WANT_COMMERCIAL"
+echo " using: with-shuttle = $WANT_SHUTTLE"
echo ""
echo " using: thirdparty build = $WANT_CIN_3RDPARTY"
echo " using: single-user = $WANT_CINBIN_BUILD"
echo "CFLAGS_ := ${CFLAGS:--g -O2}"
echo "endif"
echo "endif"
+echo "ifndef CXXFLAGS_"
+echo "ifdef CXXFLAGS"
+echo "CXXFLAGS_ := \$(CXXFLAGS)"
+echo "endif"
+echo "endif"
+echo "ifndef LDFLAGS_"
+echo "ifdef LDFLAGS"
+echo "LDFLAGS_ := \$(LDFLAGS)"
+echo "endif"
+echo "endif"
echo "CFLAGS := \$(CFLAGS_)"
echo "CFLAGS += '-DCIN=\"\$(WANT_CIN)\"'"
echo "CFLAGS += '-DCIN_BROWSER=\"$WANT_CIN_BROWSER\"'"
for flg in $CFG_CFLAGS; do echo "CFLAGS += $flg"; done
echo ""
-for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
-echo ""
+if test "x$CFG_CXXFLAGS" != "x"; then
+ for flg in $CFG_CXXFLAGS; do echo "CXXFLAGS += $flg"; done
+ echo ""
+fi
+if test "x$CFG_LDFLAGS" != "x" ; then
+ echo "LDFLAGS +=$CFG_LDFLAGS"
+ echo ""
+fi
if test "x$WANT_X264_HIDEPTH" = "xyes" ; then
X264_CFG_PARAMS="$X264_CFG_PARAMS --bit-depth=10"