summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-15 14:46:47 +0100
committerStefan Metzmacher <metze@samba.org>2008-01-18 17:02:10 +0100
commit928f899948d25a133c9622a2ac8208e4499ba260 (patch)
tree9442b3137db56421de3b5abede193f44c07904d0
parent27d9ac321961891b0580a9f67366ef6b603de418 (diff)
downloadsamba-928f899948d25a133c9622a2ac8208e4499ba260.tar.gz
samba-928f899948d25a133c9622a2ac8208e4499ba260.tar.bz2
samba-928f899948d25a133c9622a2ac8208e4499ba260.zip
r25970: libreplace: fix AC_N_DEFINE() so that some appears in config.h
metze (cherry picked from commit a07c983fde52607806745914bb41039afb5618cc) (This used to be commit 3db37038b3e5a59a9baa85f6bcd32ac6e5ec2da1)
-rw-r--r--source3/lib/replace/libreplace_macros.m417
1 files changed, 12 insertions, 5 deletions
diff --git a/source3/lib/replace/libreplace_macros.m4 b/source3/lib/replace/libreplace_macros.m4
index 92fecd3db8..54e6b7ac75 100644
--- a/source3/lib/replace/libreplace_macros.m4
+++ b/source3/lib/replace/libreplace_macros.m4
@@ -248,11 +248,18 @@ m4_define([AH_CHECK_FUNC_EXT],
dnl Define an AC_DEFINE with ifndef guard.
dnl AC_N_DEFINE(VARIABLE [, VALUE])
-define(AC_N_DEFINE,
-[cat >> confdefs.h <<\EOF
-[#ifndef] $1
-[#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1)
-[#endif]
+AC_DEFUN([AC_N_DEFINE],
+[
+AH_VERBATIM([$1], [
+#ifndef $1
+# undef $1
+#endif
+])
+
+ cat >>confdefs.h <<\EOF
+#ifndef $1
+[#define] $1 m4_if($#, 1, 1, [$2])
+#endif
EOF
])