bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [bug-gnulib] imported AC_LIBSOURCES, AC_LIBOBJ changes from coreutil


From: James Youngman
Subject: Re: [bug-gnulib] imported AC_LIBSOURCES, AC_LIBOBJ changes from coreutils to gnulib
Date: Tue, 22 Mar 2005 00:17:03 +0000
User-agent: Mutt/1.3.28i

On Mon, Mar 21, 2005 at 02:21:40PM -0800, Paul Eggert wrote:

> This weekend I snapped.  It was too much of a pain to maintain the
> fork, for the coreutils macros.  So I propagated the coreutils changes
> into gnulib just now.  A patch is enclosed below.

This provoked me to update the version of gnulib that findutils uses.
findutils-4.2.20 was a "stable" release and shipped with the gnulib
code as at 2005-02-23 09:05 UTC.  

Updating gnulib to the current code reveals that the generated
Makefile.am (produced with gnulib-tool --import) is no longer
compatible with automake-1.9.5.  This is the error message:-

gnulib/lib/Makefile.am:18: automatically discovered file `stat-macros.h' should 
not be explicitly mentioned
autoreconf: automake failed with exit status: 1

I attach the generated Makefile.am file, which includes the
"gnulib-tool" command line necessary to reproduce it.  You should also
be able to reproduce the problem with something like this:-

( mkdir gnulib-current && cd gnulib-current && cvs -z3 checkout -d ... gnulib )
wget ftp://ftp.gnu.org/gnu/findutils-4.2.20.tar.gz
gunzip < findutils-4.2.20.tar.gz | tar xfB - 
cd findutils-4.2.20
autoreconf -i  # gnulib 2005-02-23, works
rm -rf gnulib
sh ./import-gnulib $( cd ../gnulib-current/gnulib && /bin/pwd )
autoreconf -i # fails.


I'm really not sure what the problem is, but certainly I notice that
the following changes have been made:-



--- gnulib/m4/canonicalize.m4   2005-01-23 09:25:16.000000000 +0000
+++ gnulib.fails/m4/canonicalize.m4     2005-03-21 23:53:46.165371000 +0000
@@ -1,6 +1,6 @@
-#serial 4
+#serial 6

-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -9,6 +9,9 @@

 AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME],
   [
+    AC_LIBSOURCES([canonicalize.c, canonicalize.h, stat-macros.h])
+    AC_LIBOBJ([canonicalize])
+
     AC_REQUIRE([AC_HEADER_STDC])
     AC_CHECK_HEADERS(string.h sys/param.h stddef.h)
     AC_CHECK_FUNCS(resolvepath canonicalize_file_name)
diff -ruN gnulib/m4/filemode.m4 gnulib.fails/m4/filemode.m4
--- gnulib/m4/filemode.m4       2005-01-23 09:25:17.000000000 +0000
+++ gnulib.fails/m4/filemode.m4 2005-03-21 23:53:46.446328000 +0000
@@ -1,11 +1,14 @@
-# filemode.m4 serial 2
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# filemode.m4 serial 4
+dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.

 AC_DEFUN([gl_FILEMODE],
 [
+  AC_LIBSOURCES([filemode.c, filemode.h, stat-macros.h])
+  AC_LIBOBJ([filemode])
+
   dnl Prerequisites of lib/filemode.c.
   AC_REQUIRE([AC_HEADER_STAT])
 ])



Any ideas?

Regards,
James.

Attachment: Makefile.am.gz
Description: Generated makefile.am


reply via email to

[Prev in Thread] Current Thread [Next in Thread]