Author: metze Date: 2007-04-16 12:43:54 +0000 (Mon, 16 Apr 2007) New Revision: 22264
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22264 Log: merge from samba4: use AC_HAVE_DECL() because AC_CHECK_DECLS() defines to 1 or 0 and #ifndef doesn't work. metze Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4 branches/SAMBA_3_0/source/lib/replace/replace.h Changeset: Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4 =================================================================== --- branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2007-04-16 12:43:18 UTC (rev 22263) +++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4 2007-04-16 12:43:54 UTC (rev 22264) @@ -263,7 +263,7 @@ 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) Modified: branches/SAMBA_3_0/source/lib/replace/replace.h =================================================================== --- branches/SAMBA_3_0/source/lib/replace/replace.h 2007-04-16 12:43:18 UTC (rev 22263) +++ branches/SAMBA_3_0/source/lib/replace/replace.h 2007-04-16 12:43:54 UTC (rev 22264) @@ -162,7 +162,7 @@ #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
