Karl Berry wrote on 2006-02-26:
> > Per Bruno, the checking/mirroring for gettext happens off the latest
> > gettext *release*, not its development sources. So even if Bruno
> > accepts the patches, we have to decouple those files until the next
> > release, if we want the changes in gnulib now. (Personally I'd rather
> > keep mirroring them.)
Jim Meyering wrote on 2006-02-27:
> Ok. I've reverted the changes to those three files, for now :(
>
> If we can't clean up such little nit-picky details because of
> such a constraint, then maybe it's time to remove the constraint.
>
> Does anyone object to gnulib getting setenv.c and unsetenv.c from
> coreutils instead?
Nothing against the #ifdef HAVE_CONFIG_H change. I did this change in
gettext as well.
But the commit on 2006-02-27 also removed the <unistd.h> check, which
is needed for the --enable-relocatable stuff to work on mingw. I'm
putting it back, and removing Karl's sync of setenv.c with coreutils.
(As you said above, it was a temporary measure until the gettext 0.15
release. But in the long run, it's wrong to have a module of which I'm
the maintainer to be synced with coreutils.)
2006-07-29 Bruno Haible <[EMAIL PROTECTED]>
* setenv.c: Undo unintended modification done on 2006-02-27.
2006-07-29 Bruno Haible <[EMAIL PROTECTED]>
* srclist.txt (*setenv.[ch]): Remove rules.
*** lib/setenv.c 22 Mar 2006 22:08:04 -0000 1.16
--- lib/setenv.c 29 Jul 2006 14:32:06 -0000
***************
*** 27,33 ****
#include <stdlib.h>
#include <string.h>
! #include <unistd.h>
#if !_LIBC
# include "allocsa.h"
--- 27,35 ----
#include <stdlib.h>
#include <string.h>
! #if _LIBC || HAVE_UNISTD_H
! # include <unistd.h>
! #endif
#if !_LIBC
# include "allocsa.h"
*** config/srclist.txt 22 Jul 2006 17:03:06 -0000 1.130
--- config/srclist.txt 29 Jul 2006 14:32:06 -0000
***************
*** 284,293 ****
#$LIBCSRC/sysdeps/unix/sysv/gethostname.c lib gpl
#$LIBCSRC/sysdeps/unix/utime.c lib gpl
- $COREUTILS/lib/setenv.c lib gpl
- $COREUTILS/lib/setenv.h lib gpl
- $COREUTILS/lib/unsetenv.c lib gpl
-
$LIBTOOL/libltdl/argz.c lib gpl
$LIBTOOL/libltdl/argz_.h lib gpl
$LIBTOOL/libltdl/m4/argz.m4 m4
--- 284,289 ----
