From d702dc48f328dd5efdd2f95af9da5238769717bf Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 23 Jun 2008 11:30:06 -0600 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ gnulib-tool | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0302a270fd..941e15fb54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-23 Eric Blake + + 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 * m4/signalblocking.m4 (gl_PREREQ_SIG_HANDLER_H): Remove macro. diff --git a/gnulib-tool b/gnulib-tool index a3b9df5b07..7b660b90ce 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -2197,6 +2197,12 @@ func_import () 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 @@ func_import () 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])" -- 2.30.2