[Ffmpeg-cvslog] CVS: ffmpeg configure,1.228,1.229

Reimar Döffinger CVS reimar
Mon Jan 9 16:41:41 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv18276

Modified Files:
	configure 
Log Message:
CamStudio decoder, only 32 bit lzo mode is tested


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- configure	9 Jan 2006 01:59:58 -0000	1.228
+++ configure	9 Jan 2006 15:41:39 -0000	1.229
@@ -67,6 +67,7 @@
 echo "  --disable-dv1394         disable DV1394 grabbing [default=no]"
 echo "  --disable-network        disable network support [default=no]"
 echo "  --disable-zlib           disable zlib [default=no]"
+echo "  --disable-lzo            disable lzo [default=no]"
 echo "  --disable-simple_idct    disable simple IDCT routines [default=no]"
 echo "  --disable-vhook          disable video hooking support"
 echo "  --enable-gprof           enable profiling with gprof [$gprof]"
@@ -185,6 +186,7 @@
 dc1394="no"
 network="yes"
 zlib="yes"
+lzo="yes"
 libgsm="no"
 mp3lame="no"
 libogg="no"
@@ -485,6 +487,8 @@
   ;;
   --disable-zlib) zlib="no"
   ;;
+  --disable-lzo) lzo="no"
+  ;;
   --enable-a52) a52="yes"
   ;;
   --enable-a52bin) a52bin="yes"
@@ -985,6 +989,23 @@
 extralibs="$extralibs -lz"
 fi
 
+if test "$lzo" = "yes" -a "$gpl" = "yes"; then
+# check for liblzo
+cat > $TMPC << EOF
+#include <lzo1x.h>
+int main ( void ) {
+lzo_init();
+return 0;
+}
+EOF
+$cc $CFLAGS $LDFLAGS -o $TMPE $TMPC -llzo 2> /dev/null || lzo="no"
+else
+lzo="no"
+fi
+if test "$lzo" = "yes"; then
+extralibs="$extralibs -llzo"
+fi
+
 # test for lrintf in math.h
 cat > $TMPC << EOF
 #define _ISOC9X_SOURCE  1
@@ -1245,6 +1266,7 @@
 fi
 echo "gprof enabled    $gprof"
 echo "zlib enabled     $zlib"
+echo "lzo enabled      $lzo"
 echo "libgsm enabled   $libgsm"
 echo "mp3lame enabled  $mp3lame"
 echo "libogg enabled   $libogg"
@@ -1592,6 +1614,11 @@
   echo "CONFIG_ZLIB=yes" >> config.mak
 fi
 
+if test "$lzo" = "yes" ; then
+  echo "#define CONFIG_LZO 1" >> $TMPH
+  echo "CONFIG_LZO=yes" >> config.mak
+fi
+
 if test "$libgsm" = "yes" ; then
   echo "#define CONFIG_LIBGSM 1" >> $TMPH
   echo "CONFIG_LIBGSM=yes" >> config.mak





More information about the ffmpeg-cvslog mailing list