[MPlayer-dev-eng] [PATCH] conditionally run some configure tests

[Diego Biurrun]

I noticed that quite a few checks in configure don't make sense in most
cases because they are CPU architecture or operating system specific.
IMO it makes sense to only run them in the cases where they might trigger
and skip them the rest of the time.  This speeds up configure a bit.

Did I overlook something?

Diego
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 18731)
+++ configure	(working copy)
@@ -3119,6 +3136,7 @@
 echores "$_dvd"
 
 
+if bsdos; then
 echocheck "BSDI dvd.h"
 cat > $TMPC << EOF
 #include <dvd.h>
@@ -3132,8 +3150,10 @@
   _def_bsdi_dvd='#undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H'
 fi
 echores "$_bsdi_dvd"
+fi #if bsdos
 
 
+if hpux; then
 # also used by AIX, but AIX does not support VCD and/or libdvdread
 echocheck "HP-UX SCSI header"
 cat > $TMPC << EOF
@@ -3148,8 +3168,10 @@
   _def_hpux_scsi_h='#undef HPUX_SCTL_IO'
 fi
 echores "$_hpux_scsi_h"
+fi #if hpux
 
 
+if sunos; then
 echocheck "userspace SCSI headers (Solaris)"
 cat > $TMPC << EOF
 #   include <unistd.h>
@@ -3166,6 +3188,7 @@
   _def_sol_scsi_h='#undef SOLARIS_USCSI'
 fi
 echores "$_sol_scsi_h"
+fi #if sunos
 
 
 echocheck "termcap"
@@ -3467,8 +3490,10 @@
 echores "$_sys_sysinfo"
 
 
+if darwin; then
+
 echocheck "Mac OS X APIs"
-if test "$_macosx" = auto && darwin ; then
+if test "$_macosx" = auto ; then
     productName=`/usr/bin/sw_vers -productName`
     if test "$productName" = "Mac OS X" ; then
         _macosx=yes
@@ -3548,6 +3573,9 @@
 fi 
 echores "$_macosx_bundle"
 
+fi #if darwin
+
+
 echocheck "Samba support (libsmbclient)"
 if test "$_smbsupport" = yes; then
 	_ld_smb="-lsmbclient"
@@ -4571,6 +4599,9 @@
 fi
 echores "$_sdl"
 
+
+if win32; then
+
 echocheck "Windows waveout"
 if test "$_win32waveout" = auto ; then
   cat > $TMPC << EOF
@@ -4617,6 +4648,9 @@
 fi
 echores "$_directx"
 
+fi #if win32; then
+
+
 echocheck "NAS"
 if test "$_nas" = auto ; then
   cat > $TMPC << EOF
@@ -5042,6 +5076,7 @@
 echores "$_sunaudio"
 
 
+if sunos; then
 echocheck "Sun mediaLib"
 if test "$_mlib" = auto ; then
   _mlib=no
@@ -5060,8 +5095,10 @@
   _def_mlib='#undef HAVE_MLIB'
 fi
 echores "$_mlib"
+fi #if sunos
 
 
+if irix; then
 echocheck "SGI audio"
 if test "$_sgiaudio" = auto ; then
   # check for SGI audio
@@ -5082,6 +5119,7 @@
   _noaomodules="sgi $_noaomodules"
 fi
 echores "$_sgiaudio"
+fi #if irix
 
 
 echocheck "VCD support"
@@ -5877,14 +5915,9 @@
 echores "$_ladspa"
 
 
-if test "$_win32" = auto ; then
-  if x86 ; then
-    qnx && _win32=no
-  else
-    _win32=no # x86 arch only
-  fi
-fi
 
+if x86 && not qnx; then
+
 if test "$_win32" != no ; then
     if test -z "$_win32libdir" ; then
       for I in "$_libdir/codecs" "$_libdir/win32" /usr/local/lib/codecs /usr/lib/codecs /usr/local/lib/win32 /usr/lib/win32 ; do
@@ -5983,7 +6016,10 @@
   _nocodecmodules="dshow/dmo $_nocodecmodules"
 fi
 
+fi #if x86 && not qnx
 
+
+
 echocheck "XAnim DLL"
 if test "$_xanim" = auto ; then
   _xanim=no
@@ -6719,6 +6755,8 @@
 fi
 echores "$_tv"
 
+
+if bsd; then
 echocheck "*BSD BrookTree 848 TV interface"
 if test "$_tv_bsdbt848" = auto ; then
  _tv_bsdbt848=no
@@ -6743,7 +6781,9 @@
   _noinputmodules="tv-bsdbt848 $_noinputmodules"
 fi
 echores "$_tv_bsdbt848"
+fi #if bsd
 
+
 echocheck "Video 4 Linux TV interface"
 if test "$_tv_v4l" = auto ; then
  _tv_v4l=no
@@ -6878,6 +6918,8 @@
 fi
 echores "$_menu"
 
+
+if x86; then
 # Check to see if they want QTX codecs enabled
 echocheck "QTX codecs"
 if test "$_qtx" = auto ; then
@@ -6891,6 +6933,7 @@
     _nocodecmodules="qtx $_nocodecmodules"
 fi
 echores "$_qtx"
+fi #if x86
 
 
 echocheck "Subtitles sorting"