X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=131116b593c8c4b12f58a36baba5eb49a5c0af3d;hp=f521b1670be23f3ce9be099d0d4533c23e3593bd;hb=a19a685a46ddc630010788707d9e5b9d2342af46;hpb=b9f98da8f1cd8b7b31ead02fa41f299b56cac3da

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f521b167..131116b5 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -176,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 \
@@ -552,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])
 
@@ -725,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
@@ -739,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
@@ -758,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])