summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-02-02 13:07:30 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-02-02 13:07:30 +0000
commite2a5fd2049a444f5bbfdca28d7c05ebb8a41de8b (patch)
tree63ad8d5ee6bf9488997fcb067171f519ed534883 /configure
parent89e3a1b41655ae161fcc80039cf46478d0c3bd80 (diff)
os2 thread, network and freetype2 support by (Paul Smedley | paulat a t smedleydot d o t info)
Originally committed as revision 4922 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index d5f3b2cc7b..8159b0435b 100755
--- a/configure
+++ b/configure
@@ -411,7 +411,6 @@ v4l="no"
v4l2="no"
audio_oss="no"
dv1394="no"
-network="no"
ffserver="no"
vhook="no"
os2="yes"
@@ -1183,7 +1182,7 @@ int main( void ) { return (int) FT_Init_FreeType(0); }
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 @@ fi
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