# HG changeset patch
# User Eric Blake <ebb9@byu.net>
# Date 1214242206 21600
# Node ID 9f325fe5ac55e42e7edcefecbee68b3cd7662961
# Parent  98a089c128b8ba22a16cba95d04c5654bade2c0f
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 -r 98a089c128b8 -r 9f325fe5ac55 ChangeLog
--- 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.
diff -r 98a089c128b8 -r 9f325fe5ac55 gnulib-tool
--- 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])"