From e0818297f1de9b4c184d2fb8740d60b734656cd2 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Fri, 25 Aug 2000 08:15:10 +0000 Subject: [PATCH] Add autoconf check for awk and use proper macro $(AWK) --- build/rules.mk | 2 +- build/rules_pear.mk | 2 +- configure.in | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/rules.mk b/build/rules.mk index 2cf850ccf2..86ec3af37e 100644 --- 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 eefb9eb4b4..de00d71281 100644 --- 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 c4008cd9c1..b210957be7 100644 --- 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) -- 2.40.0