BSD 14 mods - move to ffmpeg6, move to python39, fix OpenEXR build; add missing inclu...

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

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index f0a87279e2ced5866f11765d07e6c41f1022eb96..f210281c8582adb378613e2daadafc2c3815dd4e 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -5,6 +5,7 @@ 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)
+AC_CONFIG_MACRO_DIRS([m4])
 AM_INIT_AUTOMAKE([foreign])
 LT_INIT()
 
@@ -900,7 +901,7 @@ EXROStream() : Imf::OStream("mypath") {} };
   if test "x$WANT_STATIC_BUILD" = "xno"; then
     SHARED_openexr="$LIBS"
     SHARED_LIBS+=" $LIBS"
-    CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
+    CFG_CFLAGS+=" -I/usr/local/include/Imath -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
     CFG_CFLAGS+=" $(pkg-config --cflags OpenEXR)"
     CFG_CFLAGS+=" $(pkg-config --cflags Imath)"
   fi
@@ -1280,13 +1281,13 @@ fi
 if test [ "$(uname)"] = "NetBSD" ; then
 echo "CFLAGS += -DNO_BTRACE"
 echo "CFLAGS += -DNO_CTX"
-echo "system_libs += -L/usr/pkg/lib/ffmpeg4"
+echo "system_libs += -L/usr/pkg/lib/ffmpeg6"
 echo "system_libs += -L/usr/pkg/lib/"
 echo "system_libs += -lpng16"
 echo "system_libs += -lintl"
 echo "system_libs += -lossaudio"
 echo "CFLAGS += -I/usr/X11R7/include"
-echo "CFLAGS += -I/usr/pkg/include/ffmpeg4"
+echo "CFLAGS += -I/usr/pkg/include/ffmpeg6"
 echo "CFLAGS += $(pkg-config --cflags xft)"
 echo "CFLAGS += -I/usr/pkg/include"
 echo "CFLAGS += -I/usr/pkg/include/uuid"