Mercurial > gnulib
changeset 10246:50a9076d476d
Make gnulib-cache.m4 easier to diff.
* gnulib-tool (func_import): Allow newlines when reading cached
gl_MODULES, and generate newlines when outputting gnulib-cache.m4.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Mon, 23 Jun 2008 11:30:06 -0600 |
| parents | 18a5b4f796a2 |
| children | 03122e4acd36 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jun 23 22:45:30 2008 +0200 +++ b/ChangeLog Mon Jun 23 11:30:06 2008 -0600 @@ -1,3 +1,9 @@ +2008-06-23 Eric Blake <ebb9@byu.net> + + Make gnulib-cache.m4 easier to diff. + * gnulib-tool (func_import): Allow newlines when reading cached + gl_MODULES, and generate newlines when creating gnulib-cache.m4. + 2008-06-23 Bruno Haible <bruno@clisp.org> * m4/signalblocking.m4 (gl_PREREQ_SIG_HANDLER_H): Remove macro.
--- a/gnulib-tool Mon Jun 23 22:45:30 2008 +0200 +++ b/gnulib-tool Mon Jun 23 11:30:06 2008 -0600 @@ -2197,6 +2197,12 @@ s,^.*gl_LOCAL_DIR([[ ]*\([^])]*\).*$,cached_local_gnulib_dir="\1",p } /gl_MODULES(/ { + :a + s/)/)/ + tb + N + ba + :b s,^.*gl_MODULES([[ ]*\([^])]*\).*$,cached_specified_modules="\1",p } /gl_AVOID(/ { @@ -3004,7 +3010,9 @@ esac ;; esac echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])" - echo "gl_MODULES(["`echo $specified_modules`"])" + echo "gl_MODULES([" + echo "$specified_modules" | sed 's/^/ /g' + echo "])" echo "gl_AVOID([$avoidlist])" echo "gl_SOURCE_BASE([$sourcebase])" echo "gl_M4_BASE([$m4base])"