comparison configure @ 27263:24a020de8484

Replace output redirection with grep by POSIX standard options.
author diego
date Wed, 16 Jul 2008 15:38:06 +0000
parents 09fbddd5af45
children 6cead9d8eb8f
comparison
equal deleted inserted replaced
27262:09fbddd5af45 27263:24a020de8484
2600 2600
2601 2601
2602 echocheck "language" 2602 echocheck "language"
2603 test -z "$_language" && _language=$LINGUAS 2603 test -z "$_language" && _language=$LINGUAS
2604 _language=`echo $_language | tr , " "` 2604 _language=`echo $_language | tr , " "`
2605 echo $_language | grep all > /dev/null || LANGUAGES="$_language en" 2605 echo $_language | grep -q all || LANGUAGES="$_language en"
2606 for lang in $_language ; do 2606 for lang in $_language ; do
2607 test "$lang" = all && lang=en 2607 test "$lang" = all && lang=en
2608 if test -f "help/help_mp-${lang}.h" ; then 2608 if test -f "help/help_mp-${lang}.h" ; then
2609 _language=$lang 2609 _language=$lang
2610 break 2610 break
6668 #check must be done after libavcodec one 6668 #check must be done after libavcodec one
6669 echocheck "zr" 6669 echocheck "zr"
6670 if test "$_zr" = auto ; then 6670 if test "$_zr" = auto ; then
6671 #36067's seem to identify themselves as 36057PQC's, so the line 6671 #36067's seem to identify themselves as 36057PQC's, so the line
6672 #below should work for 36067's and 36057's. 6672 #below should work for 36067's and 36057's.
6673 if grep -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci > /dev/null 2>&1; then 6673 if grep -q -s -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci ; then
6674 _zr=yes 6674 _zr=yes
6675 else 6675 else
6676 _zr=no 6676 _zr=no
6677 fi 6677 fi
6678 fi 6678 fi
7123 short ascii_name[] = { (('M'<<8)|'P'),(('l'<<8)|'a'),(('y'<<8)|'e'),(('r'<<8)|'B'), 7123 short ascii_name[] = { (('M'<<8)|'P'),(('l'<<8)|'a'),(('y'<<8)|'e'),(('r'<<8)|'B'),
7124 (('i'<<8)|'g'),(('E'<<8)|'n'),(('d'<<8)|'i'),(('a'<<8)|'n'),0}; 7124 (('i'<<8)|'g'),(('E'<<8)|'n'),(('d'<<8)|'i'),(('a'<<8)|'n'),0};
7125 int main(void) { return (int)ascii_name; } 7125 int main(void) { return (int)ascii_name; }
7126 EOF 7126 EOF
7127 if cc_check ; then 7127 if cc_check ; then
7128 if strings $TMPEXE | grep -l MPlayerBigEndian >/dev/null ; then 7128 if strings $TMPEXE | grep -q -l MPlayerBigEndian ; then
7129 _big_endian=yes 7129 _big_endian=yes
7130 else 7130 else
7131 _big_endian=no 7131 _big_endian=no
7132 fi 7132 fi
7133 else 7133 else
7236 echo "$_gui" 7236 echo "$_gui"
7237 if test "$_gui" = yes ; then 7237 if test "$_gui" = yes ; then
7238 7238
7239 # Required libraries 7239 # Required libraries
7240 if test "$_libavcodec" != yes || 7240 if test "$_libavcodec" != yes ||
7241 ! echo $_libavdecoders | grep PNG_DECODER >/dev/null 2>&1 ; then 7241 ! echo $_libavdecoders | grep -q PNG_DECODER ; then
7242 die "The GUI requires libavcodec with PNG support (needs zlib)." 7242 die "The GUI requires libavcodec with PNG support (needs zlib)."
7243 fi 7243 fi
7244 test "$_freetype" = no && test "$_bitmap_font" = no && \ 7244 test "$_freetype" = no && test "$_bitmap_font" = no && \
7245 die "The GUI requires either FreeType or bitmap font support." 7245 die "The GUI requires either FreeType or bitmap font support."
7246 if ! win32 ; then 7246 if ! win32 ; then
7840 7840
7841 ff_config_enable () { 7841 ff_config_enable () {
7842 _nprefix=$3; 7842 _nprefix=$3;
7843 test -z "$_nprefix" && _nprefix='CONFIG' 7843 test -z "$_nprefix" && _nprefix='CONFIG'
7844 for part in $1; do 7844 for part in $1; do
7845 if ` echo $2 | grep -E "(^| )$part($| )" > /dev/null `; then 7845 if ` echo $2 | grep -q -E "(^| )$part($| )" `; then
7846 echo "#define ${_nprefix}_$part 1" 7846 echo "#define ${_nprefix}_$part 1"
7847 echo "#define ENABLE_$part 1" 7847 echo "#define ENABLE_$part 1"
7848 else 7848 else
7849 echo "#define ENABLE_$part 0" 7849 echo "#define ENABLE_$part 0"
7850 fi 7850 fi