olaf neophyte and de.po updates, valgrind tweaks, delete green lady, inkscape dpi=96

[goodguy/history.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 1157b0a301fda457d2e31f2c67b898096d4c7881..131116b593c8c4b12f58a36baba5eb49a5c0af3d 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -47,6 +47,7 @@ CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 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([commercial],[enable commercial capture],[COMMERCIAL],[yes])
 CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
@@ -175,11 +176,6 @@ PKG_3RD([esound],[no],
     .libs/libesddsp.a ],
   [ . ])
 
-PKG_3RD([fdk],[auto],
-  [fdk-aac-0.1.5],
-  [ .libs/libfdk-aac.a ],
-  [ libAACdec/include libAACenc/include libSYS/include ])
-
 PKG_3RD([ffmpeg],[yes],
   [ffmpeg-4.0],
   [ libavutil/libavutil.a \
@@ -551,8 +547,6 @@ CHECK_LIB([encore], [encore], [encore])
 CHECK_HEADERS([encore], [encore headers], [encore.h])
 CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
-CHECK_LIB([fdk], [fdk-aac], [faacDecInit])
-CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h])
 CHECK_LIB([jbig], [jbig], [jbg_dec_init])
 CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
 
@@ -724,7 +718,7 @@ if test "x$WANT_CIN_3RDPARTY" != "xno"; then
 # order matters
 for dep in \
         ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
-        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 ffmpeg/fdk \
+        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 \
         libiec61883/libraw1394 libavc1394/librom1394 \
         openexr/ilmbase ilmbase/libogg \
         libtheora/libogg libtheora/libvorbis ; do
@@ -738,10 +732,10 @@ fi
 
 AC_DEFUN([PKG_PROVIDE],[
 if test "x$BUILD_$1" = "x" ; then
- if test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then
-  PKG_DISABLED([$1])
- elif test "x$PKG_$1" = "xyes"; then
+ if test "x$PKG_$1" = "xyes"; then
   PKG_FORCED([$1])
+ elif test "x$2" = "xno" -o "x$PKG_$1" = "xno"; then
+  PKG_DISABLED([$1])
  elif test "x$WANT_STATIC_BUILD" = "xyes"; then
   PKG_STATIC([$1],[static])
  elif test "x$HAVE_$1" = "xyes"; then
@@ -757,7 +751,6 @@ PKG_PROVIDE([djbfft])
 PKG_PROVIDE([encore])
 PKG_PROVIDE([audiofile],[$WANT_ESOUND])
 PKG_PROVIDE([esound],[$WANT_ESOUND])
-PKG_PROVIDE([fdk])
 PKG_PROVIDE([ffmpeg])
 PKG_PROVIDE([fftw])
 PKG_PROVIDE([flac])
@@ -835,6 +828,7 @@ echo "  using: with-ladspa-dir = $WANT_LADSPA_DIR"
 echo "  using: with-opencv = $WANT_OPENCV"
 echo "  using: with-git-ffmpeg = $WANT_GIT_FFMPEG"
 echo "  using: with-noelision = $WANT_NOELISION"
+echo "  using: with-booby = $WANT_BOOBY"
 echo "  using: with-libzmpeg = $WANT_LIBZMPEG"
 echo "  using: with-commerical = $WANT_COMMERCIAL"
 echo ""
@@ -864,6 +858,9 @@ if test "x$WANT_OPUS" = "xyes"; then
     CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus'
   fi
 fi
+if test "x$WANT_BOOBY" != "xno"; then
+  CFG_CFLAGS+=" -DBOOBY"
+fi
 
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then