Re: M4 problems

[Krister Walfridsson <cato@df.lth.se>]

Here are the changes needed to handle M4 the same way as YACC
and LEX.

   /Krister



Mon Apr 13 15:20:40 1998  Krister Walfridsson <cato@df.lth.se>

        * configure: Define DEFAULT_M4 by searching PATH.
        * Makfile.in: Use DEFAULT_M4.


*** configure.old	Fri Apr 10 19:36:19 1998
--- configure	Mon Apr 13 15:05:50 1998
***************
*** 762,767 ****
--- 762,786 ----
    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,1264 ****
--- 1278,1284 ----
                      -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





*** Makefile.in.old	Mon Apr 13 13:29:20 1998
--- Makefile.in	Mon Apr 13 14:56:17 1998
***************
*** 100,105 ****
--- 100,106 ----
  # These values are substituted by configure.
  DEFAULT_YACC = yacc
  DEFAULT_LEX = lex
+ DEFAULT_M4 = m4
  
  BISON = `if [ -f $$r/bison/bison ] ; then \
  	    echo $$r/bison/bison -L $$s/bison/ ; \
***************
*** 121,127 ****
  
  M4 = `if [ -f $$r/m4/m4 ] ; \
  	then echo $$r/m4/m4 ; \
! 	else echo m4 ; fi`
  
  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/texinfo/makeinfo/makeinfo ; \
--- 122,128 ----
  
  M4 = `if [ -f $$r/m4/m4 ] ; \
  	then echo $$r/m4/m4 ; \
! 	else echo ${DEFAULT_M4} ; fi`
  
  MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
  	then echo $$r/texinfo/makeinfo/makeinfo ; \