[Ffmpeg-cvslog] CVS: ffmpeg configure,1.241,1.242

Michael Niedermayer CVS michael
Thu Feb 2 14:07:32 CET 2006


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

Modified Files:
	configure 
Log Message:
os2 thread, network and freetype2 support by (Paul Smedley | paulat a t smedleydot d o t info)


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -d -r1.241 -r1.242
--- configure	1 Feb 2006 11:31:33 -0000	1.241
+++ configure	2 Feb 2006 13:07:29 -0000	1.242
@@ -411,7 +411,6 @@
 v4l2="no"
 audio_oss="no"
 dv1394="no"
-network="no"
 ffserver="no"
 vhook="no"
 os2="yes"
@@ -1183,7 +1182,7 @@
 EOF
 
 freetype2=no
-if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
+if test "x$targetos" != "xBeOS"; then
   if (freetype-config --version) >/dev/null 2>&1 ; then
     if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs`  > /dev/null 2>&1 ; then
       freetype2=yes
@@ -1759,6 +1758,9 @@
 if test "$os2" = "yes" ; then
   echo "#define CONFIG_OS2 1" >> $TMPH
   echo "CONFIG_OS2=yes" >> config.mak
+  echo "HAVE_OS2THREADS=yes" >> config.mak
+  echo "#define HAVE_OS2THREADS 1" >> $TMPH
+  echo "#define HAVE_THREADS 1" >> $TMPH
 fi
 
 if test "$TARGET_OS" = "SunOS" ; then





More information about the ffmpeg-cvslog mailing list