From ec8d6ddc831073781ad8881ac4ead5b56f2c524f Mon Sep 17 00:00:00 2001 From: Krister Walfridsson Date: Tue, 14 Apr 1998 12:34:37 +0200 Subject: [PATCH] configure: Define DEFAULT_M4 by searching PATH. * configure: Define DEFAULT_M4 by searching PATH. * Makfile.in: Use DEFAULT_M4. From-SVN: r19208 --- ChangeLog | 5 +++++ configure | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/ChangeLog b/ChangeLog index 13568d51bbe..9899cc7457a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 14 11:33:51 1998 Krister Walfridsson + + * configure: Define DEFAULT_M4 by searching PATH. + * Makfile.in: Use DEFAULT_M4. + Sun Apr 12 20:58:46 1998 Jeffrey A Law (law@cygnus.com) * Makefile.in (INSTALL_MODULES): Remove texinfo. diff --git a/configure b/configure index ed54cedbde3..8b4e510d0bf 100755 --- a/configure +++ b/configure @@ -762,6 +762,25 @@ do test -n "$DEFAULT_YACC" && break done +# Generate a default definition for M4. This is used if the makefile can't +# locate m4 in objdir. + +for prog in gm4 gnum4 m4 +do + set dummy $prog; tmp=$2 + IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}:" + for dir in $PATH; do + test -z "$dir" && dir=. + if test -f $dir/$tmp; then + DEFAULT_M4="$prog" + break + fi + done + IFS="$save_ifs" + + test -n "$DEFAULT_M4" && break +done + # Generate a default definition for LEX. This is used if the makefile can't # locate flex in objdir. @@ -1259,6 +1278,7 @@ EOF -e "s|^tooldir[ ]*=.*$|tooldir = ${tooldir}|" \ -e "s:^DEFAULT_YACC[ ]*=.*$:DEFAULT_YACC = ${DEFAULT_YACC}:" \ -e "s:^DEFAULT_LEX[ ]*=.*$:DEFAULT_LEX = ${DEFAULT_LEX}:" \ + -e "s:^DEFAULT_M4[ ]*=.*$:DEFAULT_M4 = ${DEFAULT_M4}:" \ ${subdir}/Makefile.tem >> ${Makefile} # If this is a Canadian Cross, preset the values of many more