This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU M4 source repository".
http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=118acde8f302a12d6d11cd8fb63a79e221aaf8bb The branch, master has been updated via 118acde8f302a12d6d11cd8fb63a79e221aaf8bb (commit) from 5b54035664c95dbd4adbce0bdefd48eb3aa7bdd3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 118acde8f302a12d6d11cd8fb63a79e221aaf8bb Author: Eric Blake <[EMAIL PROTECTED]> Date: Mon Apr 21 14:57:23 2008 -0600 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]> ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ tests/m4.in | 13 +++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0712e8..beb686b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +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. + Fix spelling of attribution to Christopher Strachey. * doc/m4.texinfo (History, Inhibiting Invocation): Fix typo. * THANKS: Update. diff --git a/tests/m4.in b/tests/m4.in index 0ce7f91..afdeb18 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 hooks/post-receive -- GNU M4 source repository
