r22264: merge from samba4:

use AC_HAVE_DECL() because AC_CHECK_DECLS() defines to 1 or 0
and #ifndef doesn't work.

metze

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index ab7c83f9dd46831e5d04561c32133d40691998e7..e9b19b7cf51b45bdf38ba81941de5a8c806a346c 100644 (file)
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -263,7 +263,7 @@ AC_CHECK_HEADERS([sys/param.h limits.h])
 AC_CHECK_TYPE(comparison_fn_t, 
 [AC_DEFINE(HAVE_COMPARISON_FN_T, 1,[Whether or not we have comparison_fn_t])])
 
-AC_CHECK_DECLS([setenv, unsetenv])
+AC_HAVE_DECL(setenv, [#include <stdlib.h>])
 AC_CHECK_FUNCS(setenv unsetenv)
 
 AC_CHECK_FUNCS(strnlen)

diff --git a/source/lib/replace/replace.h b/source/lib/replace/replace.h
index 3b09216257f78c3ca471a84b96ede1248125e579..a5455be2b68f758df478b77aad82a6eb33d9cdb2 100644 (file)
--- a/source/lib/replace/replace.h
+++ b/source/lib/replace/replace.h
@@ -162,7 +162,7 @@ size_t rep_strnlen(const char *s, size_t n);
 #define setenv rep_setenv
 int rep_setenv(const char *name, const char *value, int overwrite);
 #else
-#ifndef HAVE_DECL_SETENV
+#ifndef HAVE_SETENV_DECL
 int setenv(const char *name, const char *value, int overwrite);
 #endif
 #endif