[MPlayer-dev-eng] [PATCH] clean up tests in configure

[Diego Biurrun]

On Tue, Jul 05, 2005 at 02:42:15AM +0200, Diego Biurrun wrote:
> 
> subshells etc:
> ==============
> 
> The patch in question consists of basically two parts
> 
> a) &&/|| --> -a/-o
> b) removing subshells and other small speedups/simplifications
> My understanding was that only a) was controversial and thus I wanted to
> commit b) alone.  I think at this point nobody is 100% certain what b)
> really consists of, so I'll split it off and propose it separately.
> We'll see whether or not it is problematic then.

Here it is:

Diego
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1021
diff -u -r1.1021 configure
--- configure	9 Jun 2005 21:14:36 -0000	1.1021
+++ configure	10 Jun 2005 07:00:22 -0000
@@ -635,7 +635,7 @@
       ;;
   esac
   echores "$cc_version"
-  (test "$cc_verc_fail" = "no") && break
+  test "$cc_verc_fail" = "no" && break
  done 
  fi # icc
   if test "$cc_verc_fail" = yes ; then
@@ -686,9 +686,7 @@
 
 fi
 echocheck "host cc"
-if not test "$_host_cc" ; then
-  _host_cc=$_cc
-fi
+test "$_host_cc" || _host_cc=$_cc
 echores $_host_cc 
 
 
@@ -6367,7 +6365,7 @@
 echores "$_network"
 
 echocheck "ftp"
-if (not beos) && (test "$_ftp" != no) ; then
+if not beos && test "$_ftp" != no ; then
   _def_ftp='#define HAVE_FTP 1'
   _inputmodules="ftp $_inputmodules"
 else
@@ -6642,7 +6640,7 @@
   # always compile with '-g' if .developer:
   if test -f ".developer" ; then
     CFLAGS="-g $CFLAGS"
-    if (test "$_crash_debug" = auto) && (not mingw32) ; then
+    if test "$_crash_debug" = auto && not mingw32 ; then
       _crash_debug=yes
     fi
     _stripbinaries=no
@@ -6783,6 +6781,6 @@
 else
   _novomodules="cvidix $_novomodules"
 fi
-if test "$_vidix" = yes && (win32); then
+if test "$_vidix" = yes && win32; then
   _vosrc="$_vosrc vo_winvidix.c"
   _vomodules="winvidix $_vomodules"