summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-11-15 14:46:47 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:45:23 +0100
commit0f134fab53489ad254ac23c740bc0a722ffa592c (patch)
tree01cfceb3c9f7164afe029de2c832ab8901a864ff
parentde119cc807f935f1a54dcd3532d1b7b434cf83fc (diff)
downloadsamba-0f134fab53489ad254ac23c740bc0a722ffa592c.tar.gz
samba-0f134fab53489ad254ac23c740bc0a722ffa592c.tar.bz2
samba-0f134fab53489ad254ac23c740bc0a722ffa592c.zip
r25970: libreplace: fix AC_N_DEFINE() so that some appears in config.h
metze (This used to be commit a07c983fde52607806745914bb41039afb5618cc)
-rw-r--r--source4/lib/replace/libreplace_macros.m417
1 files changed, 12 insertions, 5 deletions
diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 92fecd3db8..54e6b7ac75 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/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
])