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>

diff --git a/ChangeLog b/ChangeLog
index 0302a270fd830acf0d116204cd344cb0c0c4f5ab..941e15fb54830d9f5cec6c30b71b95b47389ddd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/gnulib-tool b/gnulib-tool
index a3b9df5b07dfe38c5b254ab4690c09e856f623f4..7b660b90cef42d6bdcc80adb45f2b0a5439479c7 100755 (executable)
--- 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])"