setenv: restore to working order

$HAVE_SETENV is used in gl_FUNC_SETENV, yet its definitions were
mistakenly removed.
* m4/setenv.m4 (gl_FUNC_SETENV_SEPARATE): Restore code to set
HAVE_SETENV.
* m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Restore code to initialize
HAVE_SETENV.

diff --git a/ChangeLog b/ChangeLog
index ab8f234ed51e7451dc0c667a7f2d76f7175fa18d..357f06fd02ed490891791af1414a3a9d35321e81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-19  Jim Meyering  <meyering@redhat.com>
+
+       setenv: restore to working order
+       $HAVE_SETENV is used in gl_FUNC_SETENV, yet its definitions were
+       mistakenly removed.
+       * m4/setenv.m4 (gl_FUNC_SETENV_SEPARATE): Restore code to set
+       HAVE_SETENV.
+       * m4/stdlib_h.m4 (gl_STDLIB_H_DEFAULTS): Restore code to initialize
+       HAVE_SETENV.
+
 2010-12-19  Bruno Haible  <bruno@clisp.org>
 
        Document some different function declarations on OSF/1 5.1.

diff --git a/m4/setenv.m4 b/m4/setenv.m4
index ccbe267bd75f1880d75ab1b54f51d5ece19f924a..7070a5d7cf80f30e1ed3f9c6d2304fd6e882679a 100644 (file)
--- a/m4/setenv.m4
+++ b/m4/setenv.m4
@@ -21,7 +21,9 @@ AC_DEFUN([gl_FUNC_SETENV_SEPARATE],
     HAVE_DECL_SETENV=0
   fi
   AC_CHECK_FUNCS_ONCE([setenv])
-  if test $ac_cv_func_setenv = yes; then
+  if test $ac_cv_func_setenv = no; then
+    HAVE_SETENV=0
+  else
     AC_CACHE_CHECK([whether setenv validates arguments],
       [gl_cv_func_setenv_works],
       [AC_RUN_IFELSE([AC_LANG_PROGRAM([[

diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4
index e5a74cccb8829fd8275105463dca307ee9cb7114..9ec3e00d1c7b6a3461274d106a9ff278c153fc9d 100644 (file)
--- a/m4/stdlib_h.m4
+++ b/m4/stdlib_h.m4
@@ -92,6 +92,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_RANDOM_R=1;           AC_SUBST([HAVE_RANDOM_R])
   HAVE_REALPATH=1;           AC_SUBST([HAVE_REALPATH])
   HAVE_RPMATCH=1;            AC_SUBST([HAVE_RPMATCH])
+  HAVE_SETENV=1;             AC_SUBST([HAVE_SETENV])
   HAVE_DECL_SETENV=1;        AC_SUBST([HAVE_DECL_SETENV])
   HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
   HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])