X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;fp=cinelerra-5.1%2Fconfigure.ac;h=1157b0a301fda457d2e31f2c67b898096d4c7881;hb=502b6f3b6fd04f6b01c6d70dcb81aa304dd0db1c;hp=94f9b38249bbae0b4bd56ff03a40b440f33a4d77;hpb=5621db270ccbeabc106e0f438941dba6f930652b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 94f9b382..1157b0a3 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -22,9 +22,10 @@ CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
 CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
 CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
-CFG_CFLAGS+=" -I/usr/include/freetype2"
-CFG_CFLAGS+=" -I/usr/include/uuid"
-CFG_CFLAGS+=" -I/usr/include/mjpegtools"
+CFG_CFLAGS+=" -I/usr/include -I/usr/local/include"
+CFG_CFLAGS+=" -I/usr/include/freetype2 -I/usr/local/include/freetype2"
+CFG_CFLAGS+=" -I/usr/include/uuid -I/usr/local/include/uuid"
+CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
 
 AC_DEFUN([CHECK_WITH], [
 AC_ARG_WITH([$1],
@@ -556,7 +557,7 @@ CHECK_LIB([jbig], [jbig], [jbg_dec_init])
 CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
-#CFG_CFLAGS+=" -I/usr/include/mjpegtools"
+#CFG_CFLAGS+=" -I/usr/include/mjpegtools -I/usr/local/include/mjpegtools"
 #fi
 
 AC_DEFUN([CHECK_WANT], [
@@ -633,10 +634,10 @@ CHECK_WANT([LV2], [auto], [use lv2], [
  CHECK_LIB([sord], [sord-0], [sord_world_new])
  CHECK_LIB([serd], [serd-0], [serd_reader_new])
  CHECK_LIB([sratom], [sratom-0], [sratom_new])
- CFLAGS="-I/usr/include/lilv-0"
+ CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0"
  CHECK_HEADERS([lv2], [lilv headers], [lilv/lilv.h])
  CHECK_LIB([suil], [suil-0], [suil_instance_new])
- CFLAGS="-I/usr/include/suil-0"
+ CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0"
  CHECK_HEADERS([lv2], [suil headers], [suil/suil.h])
  CFLAGS="$saved_CFLAGS"])
 
@@ -657,7 +658,7 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [
  saved_CXXFLAGS="$CXXFLAGS"
  # ilmbase libs
  LIBS=" -lIlmImf -lIlmThread -lIex -lpthread"
- CXXFLAGS="-I/usr/include/OpenEXR"
+ CXXFLAGS="-I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
  AC_LANG_PUSH(C++)
  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include "ImfChannelList.h"
@@ -678,7 +679,7 @@ EXROStream() : Imf::OStream("mypath") {} };
  RESULT="$HAVE_OPENEXR"
  if test "x$RESULT" = "xyes"; then
    SHARED_openexr="$LIBS"
-   CFG_CFLAGS+=" -I/usr/include/OpenEXR"
+   CFG_CFLAGS+=" -I/usr/include/OpenEXR -I/usr/local/include/OpenEXR"
  fi
  LIBS="$saved_LIBS"
  CXXFLAGS="$saved_CXXFLAGS"
@@ -792,7 +793,8 @@ PKG_PROVIDE([suil], [$WANT_LV2])
 
 if test "x$WANT_LV2" = "xyes"; then
   if test "x$HAVE_lv2" = "xyes" -a "x$BUILD_lilv" = "x0"; then
-    CFG_CFLAGS+=' -I/usr/include/lilv-0 -I/usr/include/suil-0'
+    CFG_CFLAGS+=' -I/usr/include/lilv-0 -I/usr/local/include/lilv-0'
+    CFG_CFLAGS+=' -I/usr/include/suil-0 -I/usr/local/include/suil-0'
   fi
 fi
 
@@ -859,7 +861,7 @@ if test "x$WANT_OPUS" = "xyes"; then
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
   if test "x$HAVE_opus" = "xyes" -a "x$BUILD_opus" = "x0"; then
     EXTRA_LIBS+=' -lopus'
-    CFG_CFLAGS+=' -I/usr/include/opus'
+    CFG_CFLAGS+=' -I/usr/include/opus -I/usr/local/include/opus'
   fi
 fi
 
@@ -1007,7 +1009,7 @@ if test "x$WANT_GIT_FFMPEG" != "xno"; then
   echo "ffmpeg.git := $WANT_GIT_FFMPEG"
 fi
 if test "x$WANT_OPUS" = "xyes" -a "x$BUILD_opus" = "x0"; then
-  echo 'ffmpeg.cflags+=" -I/usr/include/opus"'
+  echo 'ffmpeg.cflags+=" -I/usr/include/opus -I/usr/local/include/opus"'
 fi
 if test "x$X264_CFG_PARAMS" != "x" ; then
   echo "x264.cfg_params :=$X264_CFG_PARAMS --enable-static --enable-pic"