Re: getloadavg and LIBOBJDIR

[Jim Meyering]

Jim Meyering <address@hidden> wrote:
...
> That change breaks coreutils' configure.
> It happens because of this assignment in configure:
>
>   gl_source_base='.#bootmp/lib'
>
> When configure is run, .#bootmp/lib no longer exists, so the
> check for existence of getloadavg.c is wrong:
>
> test -f "$srcdir/$gl_source_base/getloadavg.c" ||
>   { { echo "$as_me:$LINENO: error: $srcdir/$ac_config_libobj_dir/getloadavg.c 
> is missing" >&5
>
> Confusingly, the diagnostic says ./lib/getloadavg.c is missing,
> (which isn't true) while the preceding test checks
> for ./.#bootmp/lib/getloadavg.c.

I'll let you deal with the inconsistency in getloadavg.m4.

The problem that causes the coreutils build failure is due in part
to the way the bootstrap script invokes gnulib-tool, then moves/links
the resulting files into our canonical lib/ and m4/ directories.
Since coreutils is perhaps unusual in doing things this way,
I'm working around it with this patch:

2006-09-23  Jim Meyering  <address@hidden>

        * 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".
        * Makefile.am (EXTRA_DIST): Sort file names.
        Add bootstrap and gl/modules/getloadavg.diff

Index: gl/modules/getloadavg.diff
===================================================================
RCS file: gl/modules/getloadavg.diff
diff -N gl/modules/getloadavg.diff
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gl/modules/getloadavg.diff  23 Sep 2006 16:41:36 -0000
@@ -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:
+
Index: bootstrap
===================================================================
RCS file: /fetish/cu/bootstrap,v
retrieving revision 1.16
diff -u -r1.16 bootstrap
--- bootstrap   20 Sep 2006 21:28:26 -0000      1.16
+++ bootstrap   23 Sep 2006 16:40:20 -0000
@@ -381,6 +381,7 @@
  --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 &&
Index: Makefile.am
===================================================================
RCS file: /fetish/cu/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- Makefile.am 26 Aug 2006 16:18:04 -0000      1.28
+++ Makefile.am 23 Sep 2006 16:56:46 -0000
@@ -20,30 +20,32 @@

 SUBDIRS = lib src doc man po tests
 EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
-  .hgignore \
   .gitignore \
+  .hgignore \
   .kludge-stamp .prev-version THANKS-to-translators THANKStt.in \
   .vg-suppressions \
   .x-po-check \
-  .x-sc_space_tab .x-sc_sun_os_names \
   .x-sc_file_system .x-sc_obsolete_symbols \
-  .x-sc_unmarked_diagnostics \
-  .x-sc_useless_cpp_parens \
-  .x-sc_require_config_h \
   .x-sc_prohibit_atoi_atof \
+  .x-sc_require_config_h \
+  .x-sc_space_tab .x-sc_sun_os_names \
   .x-sc_trailing_blank \
+  .x-sc_unmarked_diagnostics \
+  .x-sc_useless_cpp_parens \
+  ChangeLog-2005 \
   announce-gen \
+  bootstrap \
   build-aux/cvsu \
   build-aux/vc-list-files \
+  gl/modules/getloadavg.diff \
   m4/ChangeLog \
-  ChangeLog-2005 \
   old/fileutils/ChangeLog \
   old/fileutils/ChangeLog-1997 \
+  old/fileutils/NEWS \
   old/sh-utils/ChangeLog \
   old/sh-utils/ChangeLog.0 \
-  old/textutils/ChangeLog \
-  old/fileutils/NEWS \
   old/sh-utils/NEWS \
+  old/textutils/ChangeLog \
   old/textutils/NEWS

 install-root: