X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fthirdparty%2Fconfigure;h=1752c0ec05b923e751dd08fdeff8df171def9a25;hb=bb02ac232cc030971ef6c03019f4de77da055153;hp=f529bd235f2fbefd815cea002651ed5a4a500824;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/thirdparty/configure b/cinelerra-5.1/thirdparty/configure
index f529bd23..1752c0ec 100755
--- a/cinelerra-5.1/thirdparty/configure
+++ b/cinelerra-5.1/thirdparty/configure
@@ -1,5 +1,17 @@
 #!/bin/bash
 
+if [ -x "`which gmake`" ]; then
+  MAKE=gmake
+else
+  MAKE=make
+fi
+
+for v in OBJDIR CPATH EXTRA_LIBS HAVE_LADSPA \
+    HAVE_ALSA HAVE_DVB HAVE_ESOUND HAVE_FIREWIRE HAVE_DV \
+    HAVE_OSS HAVE_XFT HAVE_VIDEO4LINUX HAVE_VIDEO4LINUX2 ; do
+  eval export "$v=\"`$MAKE -s val-$v`\""
+done
+
 if [ "$1" = "static" ]; then
   STATIC_LIBRARIES="y"
 elif [ "$1" = "shared" ]; then
@@ -45,18 +57,20 @@ add_library() {
 inc_a52dec="include"
 add_library a52dec \
 	liba52/.libs/liba52.a
-inc_audiofile="."
+inc_audiofile="libaudiofile"
 add_library audiofile \
 	libaudiofile/.libs/libaudiofile.a \
 	libaudiofile/modules/.libs/libmodules.a \
 	libaudiofile/alac/.libs/libalac.a
 inc_encore="."
 add_library encore \
-	`uname -m`/libencore.a
+	$OBJDIR/libencore.a
+if [ "$HAVE_ESOUND" = "y" ]; then
 inc_esound="."
 add_library esound \
 	.libs/libesd.a \
 	.libs/libesddsp.a
+fi
 inc_faac="include"
 add_library faac \
 	libfaac/.libs/libfaac.a \
@@ -119,23 +133,32 @@ add_library ilmbase \
 	Half/.libs/libHalf.a \
 	Imath/.libs/libImath.a \
 	IlmThread/.libs/libIlmThread.a
+if [ "$HAVE_LADSPA" = "y" ]; then
 inc_ladspa=""
 add_library ladspa
+fi
 inc_lame="include"
 add_library lame \
 	libmp3lame/.libs/libmp3lame.a \
 	mpglib/.libs/libmpgdecoder.a
+if [ "$HAVE_FIREWIRE" = "y" ]; then
 inc_libavc1394="."
 add_library libavc1394 \
 	libavc1394/.libs/libavc1394.a \
 	librom1394/.libs/librom1394.a \
 	common/.libs/libraw1394util.a
-inc_libdv="."
-add_library libdv \
-	libdv/.libs/libdv.a
+inc_libraw1394="."
+add_library libraw1394 \
+	src/.libs/libraw1394.a
 inc_libiec61883="src"
 add_library libiec61883 \
 	src/.libs/libiec61883.a
+fi
+if [ "$HAVE_DV" = "y" ]; then
+inc_libdv="."
+add_library libdv \
+	libdv/.libs/libdv.a
+fi
 inc_libjpeg="."
 add_library libjpeg \
 	.libs/libjpeg.a \
@@ -147,9 +170,6 @@ add_library openjpeg \
 inc_libogg="include"
 add_library libogg \
 	src/.libs/libogg.a
-inc_libraw1394="."
-add_library libraw1394 \
-	src/.libs/libraw1394.a
 inc_libsndfile="."
 add_library libsndfile \
 	src/.libs/libsndfile.a \
@@ -222,6 +242,7 @@ echo ""
 probe() {
   if ! `echo $LIBS | grep -qw $1`; then return 0; fi
   local name="$1"
+  if [ -n "${!name}" ]; then return 0; fi
   local headers="$2"
   local func="$3"
   shift 3
@@ -243,7 +264,7 @@ probe() {
       echo "long check_$func(void) { return (long) $func; }"
     done
     echo "int main(void) { return 0; }"
-  } | cc -x c - -o $exe $@ >& /dev/null
+  } | cc -x c - -o $exe $@ $EXTRA_LIBS >& /dev/null
   ret=$?
   rm -f "${exe}"
   if [ $ret = 0 ]; then
@@ -288,9 +309,7 @@ probe twolame "twolame.h" twolame_encode_buffer_float32_interleaved -ltwolame
 probe x264 "stdint.h x264.h" x264_encoder_encode -lx264
 probe x265 "x265.h" x265_encoder_encode -lx265
 
-if [ -n "$forced_libs" ]; then
-  forced_libs="encore ffmpeg giflib libuuid"
-fi
+forced_libs="$forced_libs a52dec encore ffmpeg giflib libuuid openjpeg"
 
 # for ffmpeg link/broken disto libs
 for name in $LIBS; do