cvs: php4 / configure.in /build rules.mk rules_pear.mk

sas Fri Aug 25 01:15:10 2000 EDT Modified files: /php4 configure.in /php4/build rules.mk rules_pear.mk Log: Add autoconf check for awk and use proper macro $(AWK) Index: php4/configure.in diff -u php4/configure.in:1.168 php4/configure.in:1.169 --- php4/configure.in:1.168 Mon Aug 21 17:27:17 2000 +++ php4/configure.in Fri Aug 25 01:15:08 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.168 2000/08/22 00:27:17 rasmus Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.169 2000/08/25 08:15:08 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -73,6 +73,7 @@ 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(phptempdir) PHP_SUBST(prefix) +PHP_SUBST(AWK) PHP_SUBST(CC) PHP_SUBST(CFLAGS) PHP_SUBST(CONFIGURE_COMMAND) Index: php4/build/rules.mk diff -u php4/build/rules.mk:1.23 php4/build/rules.mk:1.24 --- php4/build/rules.mk:1.23 Thu Aug 24 04:02:03 2000 +++ php4/build/rules.mk Fri Aug 25 01:15:10 2000 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules.mk,v 1.23 2000/08/24 11:02:03 sas Exp $ +# $Id: rules.mk,v 1.24 2000/08/25 08:15:10 sas Exp $ # include $(top_srcdir)/build/rules_common.mk @@ -41,7 +41,7 @@ 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 Index: php4/build/rules_pear.mk diff -u php4/build/rules_pear.mk:1.11 php4/build/rules_pear.mk:1.12 --- php4/build/rules_pear.mk:1.11 Fri Aug 25 00:22:05 2000 +++ php4/build/rules_pear.mk Fri Aug 25 01:15:10 2000 @@ -14,7 +14,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: rules_pear.mk,v 1.11 2000/08/25 07:22:05 sas Exp $ +# $Id: rules_pear.mk,v 1.12 2000/08/25 08:15:10 sas Exp $ # include $(top_srcdir)/build/rules_common.mk @@ -43,7 +43,7 @@ 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