X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=4e469cf81c489af5abcfaaae1a48ea4b290b2927;hb=390d5a7cad1265cf926a682dffb850685f36b775;hp=31ebe590efaefce356bb27c7fee3dda2b0722d8c;hpb=ed5614eb56a4a440d37f20c02c5f323bac53a577;p=ffmpeg

diff --git a/configure b/configure
index 31ebe590efa..4e469cf81c4 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,6 @@ show_help(){
   echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
   echo "  --enable-swscaler        software scaler support [default=no]"
   echo "  --enable-beosthreads     use BeOS threads [default=no]"
-  echo "  --enable-os2threads      use OS/2 threads [default=no]"
   echo "  --enable-pthreads        use pthreads [default=no]"
   echo "  --enable-w32threads      use Win32 threads [default=no]"
   echo "  --enable-x11grab         enable X11 grabbing [default=no]"
@@ -613,7 +612,6 @@ CONFIG_LIST='
 
 THREADS_LIST='
     beosthreads
-    os2threads
     pthreads
     w32threads
 '
@@ -653,6 +651,7 @@ HAVE_LIST="
     arpa_inet_h
     byteswap_h
     cmov
+    conio_h
     dcbzl
     dev_bktr_ioctl_bt848_h
     dev_bktr_ioctl_meteor_h
@@ -666,7 +665,10 @@ HAVE_LIST="
     fast_64bit
     fast_cmov
     fast_unaligned
+    fork
     freetype2
+    GetProcessTimes
+    getrusage
     imlib2
     inet_aton
     lrintf
@@ -674,14 +676,15 @@ HAVE_LIST="
     machine_ioctl_meteor_h
     malloc_h
     memalign
+    mkstemp
     mlib
-    os2
     ppc64
     sdl
     sdl_video_size
     soundcard_h
     sys_poll_h
     sys_soundcard_h
+    termios_h
     threads
 "
 
@@ -721,6 +724,7 @@ msmpeg4v2_decoder_deps="h263_decoder"
 msmpeg4v3_decoder_deps="h263_decoder"
 png_decoder_deps="zlib"
 png_encoder_deps="zlib"
+svq3_decoder_deps="h264_parser"
 vc1_decoder_deps="h263_decoder"
 wmv1_decoder_deps="h263_decoder"
 wmv2_decoder_deps="h263_decoder"
@@ -754,7 +758,6 @@ audio_demuxer_deps_any="audio_oss audio_beos"
 audio_muxer_deps_any="audio_oss audio_beos"
 dc1394_demuxer_deps="dc1394"
 dv1394_demuxer_deps="dv1394"
-gxf_muxer_deps="gpl"
 libnut_demuxer_deps="libnut"
 libnut_muxer_deps="libnut"
 mp3_demuxer_deps="mpegaudio_parser"
@@ -898,6 +901,7 @@ DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path
 PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"`
 
 enable $ENCODER_LIST $DECODER_LIST $PARSER_LIST $MUXER_LIST $DEMUXER_LIST $PROTOCOL_LIST $BSF_LIST
+enable $ARCH_EXT_LIST
 
 die_unknown(){
     echo "Unknown option \"$1\"."
@@ -1183,27 +1187,6 @@ case $targetos in
     targetos=irix
     ranlib="echo ignoring ranlib"
     ;;
-  os/2)
-    TMPE=$TMPE".exe"
-    ar="emxomfar -p128"
-    ranlib="echo ignoring ranlib"
-    strip="echo ignoring strip"
-    add_cflags "-Zomf"
-    FFLDFLAGS="-Zomf -Zstack 16384 -s"
-    SHFLAGS="-Zdll -Zomf"
-    FFSERVERLDFLAGS=""
-    LIBPREF=""
-    LIBSUF=".lib"
-    SLIBPREF=""
-    SLIBSUF=".dll"
-    EXESUF=".exe"
-    osextralibs=""
-    pkg_requires=""
-    dv1394="no"
-    ffserver="no"
-    vhook="no"
-    os2="yes"
-    ;;
   *)
     targetos="${targetos}-UNKNOWN"
     ;;
@@ -1275,7 +1258,6 @@ if disabled gpl ; then
     die_gpl_disabled "The software scaler"     swscaler
 fi
 
-enable     $ARCH_EXT_LIST
 check_deps $ARCH_EXT_LIST
 
 test -z "$need_memalign" && need_memalign="$mmx"
@@ -1530,6 +1512,11 @@ fi
 
 check_header byteswap.h
 
+check_func mkstemp
+
+check_header termios.h
+check_header conio.h
+
 check_header arpa/inet.h
 
 check_func inet_aton
@@ -1611,6 +1598,9 @@ elif check_func dlopen -ldl; then
     ldl=-ldl
 fi
 
+check_func getrusage
+check_func2 windows.h GetProcessTimes
+
 check_func fork
 
 test "$vhook" = "default" && vhook="$dlopen"
@@ -1757,7 +1747,7 @@ if enabled gprof; then
     add_ldflags "-p"
 fi
 
-VHOOKCFLAGS="-fPIC `echo $CFLAGS | sed s/-mdynamic-no-pic//`"
+VHOOKCFLAGS="-fPIC"
 
 # find if .align arg is power-of-two or not
 if test $asmalign_pot = "unknown"; then
@@ -2005,6 +1995,7 @@ if enabled source_path_used; then
          libavutil \
          libswscale \
          tests \
+         tools \
          vhook \
          "
     FILES="\