summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-08-25 08:15:10 +0000
committerSascha Schumann <sas@php.net>2000-08-25 08:15:10 +0000
commite0818297f1de9b4c184d2fb8740d60b734656cd2 (patch)
tree500c9757f2015abe4552d4f7065fc2e2289789e6
parentf6e38a2e95096862bc2d0719f46331f5526f3c1d (diff)
downloadphp-git-e0818297f1de9b4c184d2fb8740d60b734656cd2.tar.gz
Add autoconf check for awk and use proper macro $(AWK)
-rw-r--r--build/rules.mk2
-rw-r--r--build/rules_pear.mk2
-rw-r--r--configure.in2
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)