Add autoconf check for awk and use proper macro $(AWK)

diff --git a/build/rules.mk b/build/rules.mk
index 2cf850ccf29e30e9ccc178e3b7a4526e89860c89..86ec3af37e3a9f4f45b88f58e03b2649fd2912e3 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -41,7 +41,7 @@ install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-       @echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | awk -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
+       @echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
 
 clean: clean-recursive clean-x
 

diff --git a/build/rules_pear.mk b/build/rules_pear.mk
index eefb9eb4b422153feaf7724676571d49d404fc60..de00d7128119a260c98930e9d9cecaa0df000dcd 100644 (file)
--- a/build/rules_pear.mk
+++ b/build/rules_pear.mk
@@ -43,7 +43,7 @@ install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-       @echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | awk -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
+       @echo $(top_srcdir) $(top_builddir) $(srcdir) $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c *.c | $(AWK) -f $(top_srcdir)/build/mkdep.awk > $(builddir)/.deps || true
 
 clean: clean-recursive clean-x
 

diff --git a/configure.in b/configure.in
index c4008cd9c1b874b0699de5a3cddb287a63db7ce8..b210957be752483c3d8c44d89ddaa83bc98a187e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,6 +73,7 @@ dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
 
 dnl Checks for programs.
+AC_PROG_AWK
 AC_PROG_YACC
 if test "$YACC" != "bison -y"; then
     AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.)
@@ -695,6 +696,7 @@ PHP_SUBST(phplibdir)
 PHP_SUBST(phptempdir)
 PHP_SUBST(prefix)
 
+PHP_SUBST(AWK)
 PHP_SUBST(CC)
 PHP_SUBST(CFLAGS)
 PHP_SUBST(CONFIGURE_COMMAND)