[MPlayer-dev-eng] [PATCH] fix direct.h io.h

[Stephen Sheldon]

Carl Eugen Hoyos <cehoyos <at> ag.or.at> writes:

> 
> Stephen Sheldon <sfsheldo <at> gmail.com> writes:
> 
> > HAVE_W32THREADS 1'
> >  echores "$_w32threads"
> 
> >  fi #if win32; then
> > +if win32; then
> 
> This looks as if the two ifs can be merged, or is that unwanted?
> 
> > +  echocheck "HAVE_DIRECT_H"
> 
> echocheck "direct.h" ?
> (I did not check how it is done elsewhere in configure)
> 
> Carl Eugen
> 
Maybe now I understand Carl Eugen's hints.  Here is a revised patch.

Index: configure
===================================================================
--- configure	(revision 35204)
+++ configure	(working copy)
@@ -3727,6 +3727,24 @@
 fi
 test "$_w32threads" = yes && def_threads='#define HAVE_THREADS 1' &&
def_w32threads='#define HAVE_W32THREADS 1'
 echores "$_w32threads"
+echocheck "direct.h"
+_direct_h=no
+header_check direct.h && _direct_h=yes
+if [ $_direct_h = yes ]; then
+  def_direct_h='#define HAVE_DIRECT_H 1'
+else
+  def_direct_h='#define HAVE_DIRECT_H 0'
+fi
+echores "$_direct_h"
+echocheck "io.h"
+_io_h=no
+header_check io.h && _io_h=yes
+if [ $_io_h = yes ]; then
+  def_io_h='#define HAVE_IO_H 1'
+else
+  def_io_h='#define HAVE_IO_H 0'
+fi
+echores "$_io_h"
 fi #if win32; then
 
 
@@ -8962,6 +8980,8 @@
 $def_mp3lame_lavc
 $def_x264_lavc
 $def_xvid_lavc
+$def_direct_h
+$def_io_h
 
 $(ff_config_enable "$libavdecoders_all"  "$libavdecoders" "#")
 $(ff_config_enable "$libavencoders_all"  "$libavencoders" "#")