From ec1be2cf3f253fda14e40cd43fb348f8dcdaa6fd Mon Sep 17 00:00:00 2001 From: atmos4 Date: Tue, 15 Jan 2002 14:49:36 +0000 Subject: [PATCH] *awk detection git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4173 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 34 ++++++++++++++++------------------ libdha/Makefile | 2 +- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/configure b/configure index ba55277213..b714953883 100755 --- a/configure +++ b/configure @@ -1007,26 +1007,23 @@ if x86 && linux ; then fi fi -#checking for gawk +# checking for a working awk, I'm using mawk first, because it's fastest - atmos +_awk= if test "$_vidix" = yes ; then -_gawk_ver=`echo '' | awk -W version 2>&1 | sed -n 's/^.*wk \([^A-Za-z ]*[0-9.]*\).*$/\1/p'` - case $_gawk_ver in - '') - _gawk_ver="v. ?.??, bad" - _gawk_verc_fail=yes - ;; - *) - _gawk_ver="$_gawk_ver, ok" - ;; - esac -echo Checking for awk ... $_gawk_ver -if test "$_gawk_verc_fail" ; then -echo "Awk was not found or has wrong version." -echo "If you have no such one, then the GNU implementation can be downloaded from:" +_awk_works=no +for _awk in mawk gawk nawk awk; do + if echo 'BEGIN{testme();}function testme(){print"test";}'|$_awk -f/dev/stdin 2>&1 >/dev/null; then + _awk_works=yes + break + fi +done +test "$_awk_works" = no && _awk=no +echo Checking for awk ... $_awk +if test "$_awk_works" = no; then +echo "VIDIX needs Awk, but there was no working implementation found!" +echo "Try the GNU implementation, which can be downloaded from:" echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "Also check - maybe you already have gawk, mawk or nawk." -echo "If test is successful then make awk symlink. Example: ln -sf gawk awk" -echo "Or rerun configure with --disable-vidix option." +echo "If you don't need vidix, you can use configure --disable-vidix instead." exit fi fi @@ -2774,6 +2771,7 @@ DATADIR = $_datadir CONFDIR = $_confdir AR = ar CC = $_cc +AWK = $_awk # OPTFLAGS = -O4 $_profile $_debug $_march $_mcpu -pipe -fomit-frame-pointer -ffast-math OPTFLAGS = $CFLAGS EXTRA_INC = $_inc_extra $_inc_gtk diff --git a/libdha/Makefile b/libdha/Makefile index 53759845f9..13e789e974 100644 --- a/libdha/Makefile +++ b/libdha/Makefile @@ -31,7 +31,7 @@ all: $(LIBNAME) $(SHORTNAME) pci_names.c: gzip -d -c oth/pci.db.gz >pci.db - awk -f pci_db2c.awk pci.db + $(AWK) -f pci_db2c.awk pci.db test: $(CC) test.c -o test $(SHORTNAME)