[MPlayer-cvslog] r23335 - in trunk: configure vidix/Makefile

[diego]

Author: diego
Date: Thu May 17 23:48:56 2007
New Revision: 23335

Log:
Remove awk test.  awk is a basic Unix tool, any implementation is sufficient.


Modified:
   trunk/configure
   trunk/vidix/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu May 17 23:48:56 2007
@@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then
   beos && _vidix_internal=no
   darwin && _vidix_internal=no
 fi
-
-# checking for a working awk, I'm using mawk first, because it's fastest - atmos
-_awk=awk
 if test "$_vidix_internal" = yes ; then
-_awk_verc_fail=yes
-echocheck "awk"
-for _awk in mawk gawk nawk; do
-  if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then
-    _awk_verc_fail=no
-    break
-  fi
-done
-test "$_awk_verc_fail" = yes && _awk=no
-echores "$_awk"
-if test "$_awk_verc_fail" = yes; then
-echo "VIDIX needs awk, but no working implementation was found!"
-echo "Try the GNU version, which can be downloaded from:"
-echo "ftp://ftp.gnu.org/gnu/gawk/"
-echo "If you don't need VIDIX, you can use configure --disable-vidix instead."
-die "no awk"
-fi
-fi
 
 if test "$_vidix_internal" = yes; then
   _res_comment="internal"
@@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR)
 #AR = ar
 CC = $_cc
 HOST_CC = $_host_cc
-AWK = $_awk
 RANLIB = $_ranlib
 LDCONFIG = $_ldconfig
 INSTALL = $_install

Modified: trunk/vidix/Makefile
==============================================================================
--- trunk/vidix/Makefile	(original)
+++ trunk/vidix/Makefile	Thu May 17 23:48:56 2007
@@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c
 	$(CC) -c $(CFLAGS) -DRAGE128 -o $@ $<
 
 pci_names.c pci_dev_ids.c: pci.db
-	LC_ALL=C $(AWK) -f pci_db2c.awk $<
+	LC_ALL=C awk -f pci_db2c.awk $<
 
 clean::
 	rm -f pci_*.c pci_*.h