X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=e83d466603546e1ef77da0920edd392720e8a564;hb=64dfa27066d9994d97a14fb2c21e60cba679dc5c;hp=5f55fb5f0001fd6afda4fb60e21a9d14ae86c590;hpb=081cf8f0e67b93dc26696be0a40bea71d811f0b6;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 5f55fb5f..e83d4666 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -1,11 +1,15 @@ 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" @@ -33,7 +37,7 @@ CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools" 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]) ]) @@ -55,6 +59,7 @@ CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no]) CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto]) CHECK_WITH([booby],[window lock trace booby trap],[BOOBY],[no]) CHECK_WITH([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes]) +CHECK_WITH([libdpx],[build libdpx],[LIBDPX],[auto]) CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[no]) CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes]) CHECK_WITH([shuttle],[shuttle device],[SHUTTLE],[yes]) @@ -65,6 +70,7 @@ CHECK_WITH([vdpau],[video decode+presentation api for unix],[VDPAU],[yes]) CHECK_WITH([nv],[nvenc/nvdec ffnvcodec api],[NV],[yes]) CHECK_WITH([cuda],[nv cuda plugins],[CUDA],[auto]) CHECK_WITH([clang],[use clang instead of gcc/g++],[CLANG],[no]) +CHECK_WITH([filegif],[enable filegif i/o], [GIFLIB],[yes]) if test "x$WANT_LV2" != "xno"; then GTK2_LIBS=`pkg-config --libs gtk+-2.0` @@ -156,7 +162,7 @@ inc_$1="$4" 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]) ]) @@ -196,7 +202,6 @@ PKG_3RD([ffmpeg],[yes], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ - libavdevice/libavdevice.a \ libavformat/libavformat.a \ libswscale/libswscale.a \ libavfilter/libavfilter.a \ @@ -208,7 +213,7 @@ if test "x$WANT_GIT_FFMPEG" != "xno" ; then 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 \ @@ -289,7 +294,7 @@ PKG_3RD([openjpeg],[auto], [ src/lib/openjp2 ]) PKG_3RD([libogg],[auto], - [libogg-1.3.4], + [libogg-1.3.5], [ src/.libs/libogg.a ], [ include ]) @@ -376,7 +381,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.1.0], + [tiff-4.3.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ @@ -398,7 +403,7 @@ PKG_3RD([x265],[auto], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.8.2], + [libvpx-1.11.0], [ libvpx.a ], [ . ]) @@ -452,6 +457,11 @@ PKG_3RD([ffnvcodec],[auto], [ ], [ . ]) +PKG_3RD([libdpx],[auto], + [libdpx], + [ libdpx/libdpx.a ], + [ libdpx ]) + if test [ "$(uname -o)"] = "Android" ; then PKG_3RD([libbthread],[auto], @@ -465,7 +475,7 @@ AC_SUBST(STATIC_PKGS) 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]]) ]) @@ -652,7 +662,7 @@ AC_DEFUN([CHECK_WANT], [ 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 @@ -858,14 +868,14 @@ HAVE_ilmbase=no \ 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" @@ -880,7 +890,7 @@ AC_DEFUN([PKG_STATIC],[ BUILD_$1=1 AC_SUBST(BUILD_$1) STATIC_BLDS+=" [$1]" - echo "AC_HELP_STRING([$2],[$1])" + echo "AS_HELP_STRING([$2],[$1])" fi ]) @@ -931,7 +941,7 @@ PKG_PROVIDE([esound],[$WANT_ESOUND]) PKG_PROVIDE([ffmpeg]) PKG_PROVIDE([fftw]) PKG_PROVIDE([flac]) -PKG_PROVIDE([giflib]) +PKG_PROVIDE([giflib], [$WANT_GIFLIB]) PKG_PROVIDE([ilmBase], [$WANT_OPENEXR]) PKG_PROVIDE([ladspa],[$WANT_LADSPA_BUILD]) PKG_PROVIDE([lame]) @@ -965,6 +975,7 @@ PKG_PROVIDE([serd], [$WANT_LV2]) PKG_PROVIDE([sord], [$WANT_LV2]) PKG_PROVIDE([suil], [$WANT_LV2]) PKG_PROVIDE([ffnvcodec], [$WANT_NV]) +PKG_PROVIDE([libdpx]) if test "x$WANT_LV2" = "xyes"; then if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then @@ -975,11 +986,11 @@ 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) @@ -989,7 +1000,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then fi for v in GL XFT XXF86VM OSS ALSA FIREWIRE OGG DV DVB LADSPA \ VIDEO4LINUX2 ESOUND PULSE PACTL OPENEXR LV2 \ - COMMERCIAL LIBZMPEG SHUTTLE SHUTTLE_USB XV \ + COMMERCIAL GIFLIB LIBZMPEG LIBDPX SHUTTLE SHUTTLE_USB XV \ VAAPI VDPAU CUDA NV WINTV X10TV; do eval vv="\$WANT_$v" if test "x$vv" != "xno"; then @@ -1055,7 +1066,7 @@ fi if test [ "$(uname -o)"] = "Android" ; then # termux -EXTRA_LIBS+=' -liconv' +EXTRA_LIBS+=' -liconv -landroid-shmem' fi # intel lock elision bugs