* gl/modules/getloadavg.diff: New file. Work around the way the latest

version of the getloadavg module interacts with our bootstrap script.
* bootstrap (gnulib_tool_options): Add "--local-dir gl".

diff --git a/ChangeLog b/ChangeLog
index 117bee3..228ffb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-23  Jim Meyering  <jim@meyering.net>
+
+       * gl/modules/getloadavg.diff: New file.  Work around the way the latest
+       version of the getloadavg module interacts with our bootstrap script.
+       * bootstrap (gnulib_tool_options): Add "--local-dir gl".
+
 2006-09-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * bootstrap: Add support for --force.

diff --git a/bootstrap b/bootstrap
index 127a3bb..93cfd62 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -381,6 +381,7 @@ gnulib_tool_options="\
  --m4-base $bt/m4/\
  --source-base $bt/lib/\
  --tests-base $bt/tests\
+ --local-dir gl\
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&

diff --git a/gl/modules/getloadavg.diff b/gl/modules/getloadavg.diff
new file mode 100644 (file)
index 0000000..9f24327
--- /dev/null
+++ b/gl/modules/getloadavg.diff
@@ -0,0 +1,16 @@
+Index: modules/getloadavg
+===================================================================
+RCS file: /sources/gnulib/gnulib/modules/getloadavg,v
+retrieving revision 1.13
+diff -u -p -r1.13 getloadavg
+--- modules/getloadavg 22 Sep 2006 12:47:55 -0000      1.13
++++ modules/getloadavg 23 Sep 2006 16:41:36 -0000
+@@ -14,7 +14,7 @@ stdbool
+ fcntl-safer
+ 
+ configure.ac:
+-gl_GETLOADAVG([$gl_source_base])
++gl_GETLOADAVG([lib])
+ 
+ Makefile.am:
+