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

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index d3a03d4b..e9f67c16 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -23,6 +23,8 @@ 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"
 
 AC_DEFUN([CHECK_WITH], [
 AC_ARG_WITH([$1],
@@ -44,6 +46,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,6 +60,10 @@ 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'
@@ -672,15 +681,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 +708,7 @@ for dep in \
     eval "PKG_$needs=yes"
   fi
 done
+fi
 
 AC_DEFUN([PKG_PROVIDE],[
 if test "x$BUILD_$1" = "x" ; then
@@ -765,8 +780,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 +808,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,7 +832,7 @@ 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'
   fi
@@ -826,6 +848,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 +884,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 ""