Eric Blake <ebb9 <at> byu.net> writes:
> Done in the patch below, and tested with mingw. Basically, since I'm testing
> that M4 can handle NUL bytes, I can use M4 to generate NUL bytes :)
But breaks things when ported to M4 head, at least when tested on the
uninstalled wrapper in one of my trees built with './configure --disable-
shared' (I'm not quite sure why I didn't see failures with just a
plain ./configure in my other tree):
73. others.at:350: testing ...
./others.at:358: $M4 -d -Dm4exit "$abs_srcdir/null.m4" < /dev/null
stderr:
errprint: -- --
/home/eblake/m4-patch/src/m4: cannot open module `m4': can't open the module
Files expout and /home/eblake/m4-patch/tests/testsuite.dir/at-stdout differ
73. others.at:350: 73. nul character (others.at:350): FAILED (others.at:358)
It turns out that the uninstalled wrapper tests/m4 needs to set an environment
variable rather than a command-line option, if nested invocation of __program__
is to stand a chance of working without using those same command-line options.
>From 6d03e5c59bebba04bfaa225d7de456c39c3cf3cc Mon Sep 17 00:00:00 2001
From: Eric Blake <[EMAIL PROTECTED]>
Date: Mon, 21 Apr 2008 14:57:23 -0600
Subject: [PATCH] Fix --disable-shared testsuite regression from previous patch.
* tests/m4.in: Export M4MODPATH, so that recursive m4 invocations
will also work.
Signed-off-by: Eric Blake <[EMAIL PROTECTED]>
---
ChangeLog | 6 ++++++
tests/m4.in | 13 +++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1335a87..6208de5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-21 Eric Blake <[EMAIL PROTECTED]>
+
+ Fix --disable-shared testsuite regression from previous patch.
+ * tests/m4.in: Export M4MODPATH, so that recursive m4 invocations
+ will also work.
+
2008-04-17 Eric Blake <[EMAIL PROTECTED]>
Fix testsuite bug when SIGPIPE is ignored.
diff --git a/tests/m4.in b/tests/m4.in
index 0ce7f91..0d66515 100644
--- a/tests/m4.in
+++ b/tests/m4.in
@@ -2,7 +2,7 @@
# @configure_input@
# Wrapper around a non installed m4 to make it work as an installed one.
#
-# Copyright (C) 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation, Inc.
#
# This file is part of GNU M4.
#
@@ -33,7 +33,12 @@ else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
-exec "@abs_top_builddir@/src/m4" \
- --module-directory="@abs_top_builddir@/modules" \
- ${1+"$@"}
+if test "${M4MODPATH+set}" = set ; then
+ M4MODPATH="@abs_top_builddir@/modules:$M4MODPATH"
+else
+ M4MODPATH="@abs_top_builddir@/modules"
+fi
+export M4MODPATH
+
+exec "@abs_top_builddir@/src/m4" ${1+"$@"}
exit 1
--
1.5.5
