summaryrefslogtreecommitdiff
path: root/source3/lib/replace
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-16 12:43:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:19:23 -0500
commit4341be45935487a50ff7cde28387f47fe74b13ac (patch)
tree4450eca24af05cf5be9f0d3c76effd92dc26ab1e /source3/lib/replace
parent3678d69b82a109218211d6abc89cef9c460d3b45 (diff)
downloadsamba-4341be45935487a50ff7cde28387f47fe74b13ac.tar.gz
samba-4341be45935487a50ff7cde28387f47fe74b13ac.tar.bz2
samba-4341be45935487a50ff7cde28387f47fe74b13ac.zip
r22264: merge from samba4:
use AC_HAVE_DECL() because AC_CHECK_DECLS() defines to 1 or 0 and #ifndef doesn't work. metze (This used to be commit 66b0a6cc51a3987c489cc71a17c0da632bf6a6bc)
Diffstat (limited to 'source3/lib/replace')
-rw-r--r--source3/lib/replace/libreplace.m42
-rw-r--r--source3/lib/replace/replace.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/replace/libreplace.m4 b/source3/lib/replace/libreplace.m4
index ab7c83f9dd..e9b19b7cf5 100644
--- a/source3/lib/replace/libreplace.m4
+++ b/source3/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/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index 3b09216257..a5455be2b6 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/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