bug-gnulib
[Top][All Lists]
Advanced

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

[Bug-gnulib] merging some changes from coreutils


From: Jim Meyering
Subject: [Bug-gnulib] merging some changes from coreutils
Date: Thu, 21 Nov 2002 11:13:04 +0100

FYI, I've just merged a few changes from coreutils.
The only one that may be problematic is to xmalloc.c:

        Merge in changes from the coreutils.

        * mountlist.c: #undef MNT_IGNORE before defining it, to avoid warning
        on FreeBSD.

        * makepath.c (make_path): Restore umask *before* creating the final
        component.
        (make_path): Minor reformatting.

        * xmalloc.c: Adjust to work with new autoconf macros, AC_FUNC_MALLOC
        and AC_FUNC_REALLOC: test #ifndef HAVE_MALLOC/HAVE_REALLOC.

        * mountlist.h (ME_DUMMY): Don't count entries of type `auto' as dummy
        ones.  At least on GNU/Linux systems, `auto' means something else.
        From Michael Stone.
-----------------

The xmalloc.c change reflects a change in autoconf.
If you're using a version of autoconf prior to 2.54, you'll get
a compile-time failure from that code.

I didn't think about that dependency before checking it in.
But to be honest, I think we shouldn't be catering too much
to older versions of tools like autoconf.
If it causes a problem for anyone, please let me know.

Any suggestions on how to record such dependencies?
Ideally, we'd be able to say that xmalloc.c requires autoconf-2.54
or newer, and a tool would find the max version of all *.[ch] files
used by a given package and AC_REQUIRE that.

FYI, here's the diff from coreutils:

Index: xmalloc.c
===================================================================
RCS file: /fetish/cu/lib/xmalloc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -ICopyright -r1.20 -r1.21
--- xmalloc.c   26 Jan 2001 11:13:28 -0000      1.20
+++ xmalloc.c   20 Jul 2002 07:07:48 -0000      1.21
@@ -46,12 +46,12 @@ void free ();
 # define EXIT_FAILURE 1
 #endif
 
-#ifndef HAVE_DONE_WORKING_MALLOC_CHECK
-"you must run the autoconf test for a properly working malloc -- see malloc.m4"
+#ifndef HAVE_MALLOC
+"you must run the autoconf test for a properly working malloc"
 #endif
 
-#ifndef HAVE_DONE_WORKING_REALLOC_CHECK
-"you must run the autoconf test for a properly working realloc --see 
realloc.m4"
+#ifndef HAVE_REALLOC
+"you must run the autoconf test for a properly working realloc"
 #endif
 
 /* Exit value when the requested amount of memory is not available.




reply via email to

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