X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=f521b1670be23f3ce9be099d0d4533c23e3593bd;hb=26f3c4335351a3938db78303c57a2ba6551a2a10;hp=e9f67c16a4fca3f804eccfe7ecb993cf8ee91acf;hpb=4a028c75bea81ad0f03a8004eb076dfff718a469;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index e9f67c16..f521b167 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],
@@ -46,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])
@@ -70,8 +72,6 @@ if test "x$WANT_CINBIN_BUILD" = "xyes"; then
   test "x$WANT_CINLIB_DIR" = "xauto" && WANT_CINLIB_DIR='$$CIN_PATH'
   test "x$WANT_PLUGIN_DIR" = "xauto" && WANT_PLUGIN_DIR='$$CIN_LIB/plugins'
   test "x$WANT_LADSPA_DIR" = "xauto" && WANT_LADSPA_DIR='$$CIN_LIB/ladspa'
-  sinstall=dinstall
-  suninstall=duninstall
 else
   lcldir=`test "x$prefix" = "xNONE" && prefix=$ac_default_prefix; \
     test "x$exec_prefix" = "xNONE" && exec_prefix="${prefix}"; \
@@ -94,11 +94,38 @@ else
   test "x$WANT_CINLIB_DIR" = "xauto" && WANT_CINLIB_DIR="$usrlib/$WANT_CIN"
   test "x$WANT_PLUGIN_DIR" = "xauto" && WANT_PLUGIN_DIR="$WANT_CINLIB_DIR/plugins"
   test "x$WANT_LADSPA_DIR" = "xauto" && WANT_LADSPA_DIR="$WANT_CINLIB_DIR/ladspa"
-  sinstall=cinstall
-  suninstall=cuninstall
 fi
-AC_SUBST(sinstall)
-AC_SUBST(suninstall)
+
+CIN_INSTALLS=""
+CIN_UNINSTALLS=""
+if test "x$WANT_LIBZMPEG" = "xyes"; then
+  CIN_INSTALLS+=" zmp_install"
+  CIN_UNINSTALLS+=" zmp_uninstall"
+fi
+if test "x$WANT_COMMERCIAL" = "xyes"; then
+  CIN_INSTALLS+=" com_install"
+  CIN_UNINSTALLS+=" com_uninstall"
+fi
+if test "x$WANT_LADSPA_BUILD" = "xyes"; then
+  CIN_INSTALLS+=" lad_install "
+  CIN_UNINSTALLS+=" lad_uninstall "
+fi
+if test "x$WANT_LV2" = "xyes"; then
+  CIN_INSTALLS+=" lv2_install "
+  CIN_UNINSTALLS+=" lv2_uninstall "
+fi
+AC_SUBST(CIN_INSTALLS)
+AC_SUBST(CIN_UNINSTALLS)
+
+if test "x$WANT_CINBIN_BUILD" = "xyes"; then
+  MAK_INSTALLS="dvl_install"
+  MAK_UNINSTALLS="dvl_uninstall"
+else
+  MAK_INSTALLS=" sys_install"
+  MAK_UNINSTALLS="sys_uninstall"
+fi
+AC_SUBST(MAK_INSTALLS)
+AC_SUBST(MAK_UNINSTALLS)
 
 if test "x$WANT_JOBS" = "xauto"; then
   CPUS=`grep -c "^proc" /proc/cpuinfo`
@@ -531,7 +558,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], [
@@ -608,10 +635,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"])
 
@@ -632,7 +659,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"
@@ -653,7 +680,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"
@@ -767,7 +794,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
 
@@ -808,6 +836,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 ""
@@ -832,11 +861,14 @@ if test "x$HAVE_DL" = "xyes"; then
 fi
 if test "x$WANT_OPUS" = "xyes"; then
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
-  if test "x$HAVE_OPUS" = "xyes" -a "x$BUILD_opus" = "x0"; then
+  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
+if test "x$WANT_BOOBY" != "xno"; then
+  CFG_CFLAGS+=" -DBOOBY"
+fi
 
 # intel lock elision bugs
 if test "x$WANT_NOELISION" != "xno"; then
@@ -982,7 +1014,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"