Savannah Git Hosting - m4.git/commitdiff

diff --git a/ChangeLog b/ChangeLog

index beb686b2a5bd9bf67c2c84d40f9951b9d66462c1..f53f91a0ffa69bfa0128fb70613e4bb504100308 100644 (file)

--- a/ChangeLog

+++ b/ChangeLog

2008年04月21日 Eric Blake <ebb9@byu.net>

+ Simplify previous patch.

+ * tests/m4.in: Compress assignment.

+ Suggested by Gary V. Vaughan.

+

Fix --disable-shared testsuite regression from previous patch.

* tests/m4.in: Export M4MODPATH, so that recursive m4 invocations

will also work.

diff --git a/tests/m4.in b/tests/m4.in

index afdeb1820c2f1e4259cecce933b8f9dbd38239ba..34b96046d9b35611509c21645851d8078b4eefa7 100644 (file)

--- a/tests/m4.in

+++ b/tests/m4.in

case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

fi

-if test "${M4MODPATH+set}" = set ; then

- M4MODPATH="@abs_top_builddir@/modules:$M4MODPATH"

-else

- M4MODPATH="@abs_top_builddir@/modules"

-fi

+M4MODPATH="@abs_top_builddir@/modules${M4MODPATH+:$M4MODPATH}"

export M4MODPATH

exec "@abs_top_builddir@/src/m4" ${1+"$@"}