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

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index d3a03d4b..1157b0a3 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -22,7 +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 -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],
@@ -44,6 +47,9 @@ 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([libzmpeg],[build libzmpeg],[LIBZMPEG],[yes])
+CHECK_WITH([commercial],[enable commercial capture],[COMMERCIAL],[yes])
+CHECK_WITH([thirdparty],[use thirdparty build],[CIN_3RDPARTY],[yes])
 
 if test "x$WANT_LV2" != "xno"; then
   GTK2_LIBS=`pkg-config --libs gtk+-2.0`
@@ -55,14 +61,16 @@ if test "x$WANT_LV2" != "xno"; then
   fi
 fi
 
+if test "x$WANT_COMMERCIAL" = "xyes" -a "x$WANT_LIBZMPEG" != "xyes" ; then
+  AC_MSG_ERROR([commercial requires libzmpeg support.])
+fi
+
 if test "x$WANT_CINBIN_BUILD" = "xyes"; then
   WANT_LOCALE_DIR='$$CIN_LIB/locale'
   test "x$WANT_CINDAT_DIR" = "xauto" && WANT_CINDAT_DIR='$$CIN_PATH'
   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}"; \
@@ -85,11 +93,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`
@@ -522,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], [
@@ -599,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"])
 
@@ -623,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"
@@ -644,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"
@@ -672,15 +707,20 @@ AC_DEFUN([PKG_SHARED],[
  SHARED_LIBS+="$SHARED_$1"
  echo "AC_HELP_STRING([shared],[$1])"
 ])
+
 AC_DEFUN([PKG_STATIC],[
- PKG_$1="yes"
- BUILD_$1=1
- AC_SUBST(BUILD_$1)
- STATIC_BLDS+=" [$1]"
- echo "AC_HELP_STRING([$2],[$1])"
+ if test "x$WANT_CIN_3RDPARTY" != "xno"; then
+  PKG_$1="yes"
+  BUILD_$1=1
+  AC_SUBST(BUILD_$1)
+  STATIC_BLDS+=" [$1]"
+  echo "AC_HELP_STRING([$2],[$1])"
+ fi
 ])
+
 AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])])
 
+if test "x$WANT_CIN_3RDPARTY" != "xno"; then
 # order matters
 for dep in \
         ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
@@ -694,6 +734,7 @@ for dep in \
     eval "PKG_$needs=yes"
   fi
 done
+fi
 
 AC_DEFUN([PKG_PROVIDE],[
 if test "x$BUILD_$1" = "x" ; then
@@ -752,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
 
@@ -765,8 +807,12 @@ done
 AC_SUBST(SYSTEM_LIBS)
 
 echo ""
+if test "x$WANT_CIN_3RDPARTY" != "xno"; then
+  CFG_CFLAGS+=" -DHAVE_CIN_3RDPARTY"
+fi
 for v in GL XFT XXF86VM OSS ALSA FIREWIRE DV DVB \
-	 VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2; do
+	 VIDEO4LINUX2 ESOUND PACTL OPENEXR LV2 \
+	 COMMERCIAL LIBZMPEG; do
   eval vv="\$WANT_$v"
   if test "x$vv" != "xno"; then
     CFG_CFLAGS+=" -DHAVE_$v"
@@ -789,7 +835,10 @@ 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-libzmpeg = $WANT_LIBZMPEG"
+echo "  using: with-commerical = $WANT_COMMERCIAL"
 echo ""
+echo "  using: thirdparty build = $WANT_CIN_3RDPARTY"
 echo "  using: single-user  = $WANT_CINBIN_BUILD"
 echo "  using: static-build = $WANT_STATIC_BUILD"
 echo "  using: ladspa-build = $WANT_LADSPA_BUILD"
@@ -810,9 +859,9 @@ if test "x$HAVE_DL" = "xyes"; then
 fi
 if test "x$WANT_OPUS" = "xyes"; then
   FFMPEG_EXTRA_CFG+=' --enable-libopus'
-  if "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
 
@@ -826,6 +875,7 @@ if test "x$WANT_NOELISION" != "xno"; then
   | tail -1`
 fi
 
+AC_SUBST(WANT_CIN_3RDPARTY)
 AC_SUBST(EXTRA_LIBS)
 AC_SUBST(FFMPEG_EXTRA_CFG)
 AC_SUBST(WANT_X264_HIDEPTH)
@@ -861,6 +911,7 @@ echo "export THIRDPARTY EXTRA_LIBS FFMPEG_EXTRA_CFG"
 echo ""
 
 echo "WANT_CIN := $WANT_CIN"
+CFG_WANTS+=" CIN_3RDPARTY LIBZMPEG COMMERCIAL"
 for w in $CFG_WANTS; do ww=WANT_$w; echo "WANT_$w := ${!ww}"; done
 echo ""
 
@@ -958,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"