[src/trunk]: src/tools Add the "-g -D__gnu__" flags when invoking M4 via CONF...

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e3b4e615e5d0
branches:  trunk
changeset: 789107:e3b4e615e5d0
user:      apb <apb%NetBSD.org@localhost>
date:      Tue Aug 06 21:47:01 2013 +0000

description:
Add the "-g -D__gnu__" flags when invoking M4 via CONFIGURE_ARGS
in tools/Makefile.gnuhost.  This makes the tools version of m4
behave like GNU m4.

Remove similar code from tools/autoconf/Makefile, where it didn't
work because Makefile.gnuhost would previously have overridden it.

This fixes a problem in which the tools version of autoconf complained
"M4sugar requires GNU M4.
Install it before installing M4sugar or set the M4 environment variable to its path name."

diffstat:

 tools/Makefile.gnuhost  |  4 ++--
 tools/autoconf/Makefile |  3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 22a21ac0452b -r e3b4e615e5d0 tools/Makefile.gnuhost
--- a/tools/Makefile.gnuhost    Tue Aug 06 21:41:01 2013 +0000
+++ b/tools/Makefile.gnuhost    Tue Aug 06 21:47:01 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.gnuhost,v 1.39 2012/06/19 21:48:33 hans Exp $
+#      $NetBSD: Makefile.gnuhost,v 1.40 2013/08/06 21:47:01 apb Exp $
 #
 # Rules used when building a GNU host package.  Expects MODULE to be set.
 #
@@ -56,7 +56,7 @@
                INSTALL=${HOST_INSTALL_FILE:Q} \
                LDFLAGS=${HOST_LDFLAGS:Q} \
                LEX=${LEX:Q} \
-               M4=${TOOL_M4:Q} \
+               M4=${TOOL_M4:Q}" -g -D__gnu__" \
                MAKE=${MAKE_PROGRAM:Q} \
                PATH="${TOOLDIR}/bin:$$PATH" \
                RANLIB=${HOST_RANLIB:Q} \
diff -r 22a21ac0452b -r e3b4e615e5d0 tools/autoconf/Makefile
--- a/tools/autoconf/Makefile   Tue Aug 06 21:41:01 2013 +0000
+++ b/tools/autoconf/Makefile   Tue Aug 06 21:47:01 2013 +0000
@@ -1,8 +1,7 @@
-#      $NetBSD: Makefile,v 1.4 2002/12/08 20:19:57 thorpej Exp $
+#      $NetBSD: Makefile,v 1.5 2013/08/06 21:47:01 apb Exp $
 
 MODULE=                autoconf
 
 CONFIGURE_ARGS=        --program-prefix=${_TOOL_PREFIX}
-CONFIGURE_ENV= M4="${TOOLDIR}/bin/${_TOOL_PREFIX}m4 -g -D__gnu__"
 
 .include "${.CURDIR}/../Makefile.gnuhost"