Define the putenv substitute in <stdlib.h> rather than in <config.h>.

diff --git a/ChangeLog b/ChangeLog
index c5348926b95c1f943f210a3b1b899ce511fb9485..7866e745c0fc3d84de5dc7fbd40beb8c7260f333 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2007-11-01  Bruno Haible  <bruno@clisp.org>
+
+       * lib/putenv.c: Include <stdlib.h>. Remove rpl_putenv declaration.
+       (putenv): Renamed from rpl_putenv. Change argument type from
+       'const char *' to 'char *'.
+       * m4/putenv.m4 (gl_FUNC_PUTENV): Require gl_STDLIB_H_DEFAULTS. Instead
+       of defining putenv in config.h, just set REPLACE_PUTENV.
+       * modules/putenv (Depends-on): Add stdlib.
+       (configure.ac): Invoke gl_STDLIB_MODULE_INDICATOR.
+       (Include): Use <stdlib.h>.
+       * lib/stdlib.in.h (putenv): New declaration.
+       * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Initialize GNULIB_PUTENV and
+       REPLACE_PUTENV.
+       * modules/stdlib (Makefile.am): Substitute GNULIB_PUTENV and
+       REPLACE_PUTENV.
+       Needed for MacOS X 10.5.0.
+       Reported by Peter O'Gorman <peter@pogma.com>.
+
 2007-11-01  Jim Meyering  <meyering@redhat.com>
 
        Treat an empty date string exactly like "0".

diff --git a/lib/putenv.c b/lib/putenv.c
index 1d24a578de8b423344b910980aa59a5ccf2f49e0..351b4036066c1565b617979781e66b8529f372d9 100644 (file)
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -19,11 +19,8 @@
 
 #include <config.h>
 
-/* undef putenv here, because some (e.g., Solaris 10) declare putenv in
-   with a non-const argument.  That would conflict with the declaration of
-   rpl_putenv below (due to the #define putenv rpl_putenv from config.h).  */
-#undef putenv
-int rpl_putenv (char const *);
+/* Specification.  */
+#include <stdlib.h>
 
 #include <stddef.h>
 
@@ -95,7 +92,7 @@ _unsetenv (const char *name)
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
    If STRING contains no `=', then remove STRING from the environment.  */
 int
-rpl_putenv (const char *string)
+putenv (char *string)
 {
   const char *const name_end = strchr (string, '=');
   register size_t size;
@@ -131,7 +128,7 @@ rpl_putenv (const char *string)
       environ = new_environ;
     }
   else
-    *ep = (char *) string;
+    *ep = string;
 
   return 0;
 }

diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
index a297e9e561550d1cf4c09135bb751b335ab047d4..7221ba245ea8d54caa3eff1fede3ff535206116a 100644 (file)
--- a/lib/stdlib.in.h
+++ b/lib/stdlib.in.h
@@ -167,6 +167,21 @@ extern int mkstemp (char * /*template*/);
 #endif
 
 
+#if @GNULIB_PUTENV@
+# if @REPLACE_PUTENV@
+#  undef putenv
+#  define putenv rpl_putenv
+extern int putenv (char *string);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef putenv
+# define putenv(s) \
+    (GL_LINK_WARNING ("putenv is not POSIX compliant everywhere - " \
+                      "use gnulib module putenv for portability"), \
+     putenv (s))
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/m4/putenv.m4 b/m4/putenv.m4
index 43a5dc5bee6c38b5e2a31671ea64c8a3c9c4c5dd..ba7c5c743480594bbce2421c3f917f2c772ccdcb 100644 (file)
--- a/m4/putenv.m4
+++ b/m4/putenv.m4
@@ -1,5 +1,5 @@
-# putenv.m4 serial 12
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# putenv.m4 serial 13
+dnl Copyright (C) 2002-2007 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.
@@ -10,8 +10,10 @@ dnl Check whether putenv ("FOO") removes FOO from the environment.
 dnl The putenv in libc on at least SunOS 4.1.4 does *not* do that.
 
 AC_DEFUN([gl_FUNC_PUTENV],
-[AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
-  [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_CACHE_CHECK([for SVID conformant putenv], jm_cv_func_svid_putenv,
+   [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[
     /* Put it in env.  */
     if (putenv ("CONFTEST_putenv=val"))
       return 1;
@@ -30,10 +32,9 @@ AC_DEFUN([gl_FUNC_PUTENV],
             jm_cv_func_svid_putenv=no,
             dnl When crosscompiling, assume putenv is broken.
             jm_cv_func_svid_putenv=no)
-  ])
+   ])
   if test $jm_cv_func_svid_putenv = no; then
+    REPLACE_PUTENV=1
     AC_LIBOBJ(putenv)
-    AC_DEFINE(putenv, rpl_putenv,
-      [Define to rpl_putenv if the replacement function should be used.])
   fi
 ])

diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index ea9286ef46bc66b7c81b3b5e712f4e0c6f812731..278df744c79398c18816d65b467877f050b7b5c4 100644 (file)
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 3
+# stdlib_h.m4 serial 4
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -25,6 +25,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   GNULIB_GETSUBOPT=0;     AC_SUBST([GNULIB_GETSUBOPT])
   GNULIB_MKDTEMP=0;       AC_SUBST([GNULIB_MKDTEMP])
   GNULIB_MKSTEMP=0;       AC_SUBST([GNULIB_MKSTEMP])
+  GNULIB_PUTENV=0;        AC_SUBST([GNULIB_PUTENV])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_CALLOC_POSIX=1;    AC_SUBST([HAVE_CALLOC_POSIX])
   HAVE_GETSUBOPT=1;       AC_SUBST([HAVE_GETSUBOPT])
@@ -32,4 +33,5 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_MKDTEMP=1;         AC_SUBST([HAVE_MKDTEMP])
   HAVE_REALLOC_POSIX=1;   AC_SUBST([HAVE_REALLOC_POSIX])
   REPLACE_MKSTEMP=0;      AC_SUBST([REPLACE_MKSTEMP])
+  REPLACE_PUTENV=0;       AC_SUBST([REPLACE_PUTENV])
 ])

diff --git a/modules/putenv b/modules/putenv
index cba6a047b0dd0a014333c519387a56368db646df..06a0710cbf7b457d22d151470a5c2bc5e27f2af9 100644 (file)
--- a/modules/putenv
+++ b/modules/putenv
@@ -6,14 +6,17 @@ lib/putenv.c
 m4/putenv.m4
 
 Depends-on:
+stdlib
 malloc-posix
 
 configure.ac:
 gl_FUNC_PUTENV
+gl_STDLIB_MODULE_INDICATOR([putenv])
 
 Makefile.am:
 
 Include:
+#include <stdlib.h>
 
 License:
 LGPL

diff --git a/modules/stdlib b/modules/stdlib
index 5a63df5311bd6f15dff47c158b77d5323df48dda..1c6b4f23b2ea5b07137449fe56c5b4047a0a70a4 100644 (file)
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -29,12 +29,14 @@ stdlib.h: stdlib.in.h
              -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+             -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
              -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
              -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
              -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
              -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+             -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
              < $(srcdir)/stdlib.in.h; \
        } > $@-t