X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=e0301ee8d6129879c82cc2cf363a606dbbab97da;hb=3c944af1216990dd2d963a6b0231f94df0af7947;hp=3d3faab6c49acc6357b4bbc7ca6f3cb013a594d1;hpb=1e1bf2f44bb07c89692181c87bb7070211aef59e;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 3d3faab6..e0301ee8 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -14,6 +14,7 @@ CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS" CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS" CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1" CFG_CFLAGS+=" -I/usr/include/freetype2" +CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" AC_DEFUN([CHECK_WITH], [ AC_ARG_WITH([$1], @@ -96,7 +97,7 @@ PKG_3RD([a52dec],[yes], PKG_3RD([djbfft],[yes], [djbfft-0.76], - [ djbfft.a ], + [ libdjbfft.a ], [ . ]) PKG_3RD([audiofile],[no], @@ -119,8 +120,7 @@ PKG_3RD([esound],[no], PKG_3RD([faac],[auto], [faac-1.28], - [ libfaac/.libs/libfaac.a \ - common/mp4v2/libmp4v2.a ], + [ libfaac/.libs/libfaac.a ], [ include ]) PKG_3RD([faad2],[auto], @@ -135,7 +135,7 @@ PKG_3RD([fdk],[auto], [ libAACdec/include libAACenc/include libSYS/include ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-3.0], + [ffmpeg-3.1.4], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -309,7 +309,7 @@ PKG_3RD([x264],[yes], [ . ]) PKG_3RD([x265],[yes], - [x265_1.9], + [x265_2.1], [ libx265.a ], [ . source ]) @@ -352,6 +352,7 @@ if test "x$FATAL_ERROR" != "x"; then AC_MSG_ERROR("fatal eror.") fi CHECK_PROG(PACTL, [pactl]) +WANT_PACTL=$PROG_PACTL AC_CHECK_DECL([X_HAVE_UTF8_STRING],,[no_utf=yes],[#include ]) if test "$no_utf" = "yes"; then @@ -662,7 +663,7 @@ AC_SUBST(SYSTEM_LIBS) echo "" for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \ - VIDEO4LINUX2 ESOUND; do + VIDEO4LINUX2 ESOUND PACTL; do eval vv="\$WANT_$v" if test "x$vv" != "xno"; then CFG_CFLAGS+=" -DHAVE_$v"