From 928f899948d25a133c9622a2ac8208e4499ba260 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 15 Nov 2007 14:46:47 +0100
Subject: 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)
---
 source3/lib/replace/libreplace_macros.m4 | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'source3/lib/replace/libreplace_macros.m4')

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
 ])
 
-- 
cgit 


From 2e0dc77bdad8e6c88920cfb8624a8dac981dd4c8 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 15 Nov 2007 14:55:48 +0100
Subject: r25971: libreplace: remove AC_EXTENSION_FLAG as it's the same as
 AC_N_DEFINE

metze
(cherry picked from commit 05b4619c5beff474488d1abe5e647acd94a3e20c)
(This used to be commit 58932ca791024bd9a543ff5e21bc26970ceed477)
---
 source3/lib/replace/libreplace_macros.m4 | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'source3/lib/replace/libreplace_macros.m4')

diff --git a/source3/lib/replace/libreplace_macros.m4 b/source3/lib/replace/libreplace_macros.m4
index 54e6b7ac75..1856eacf66 100644
--- a/source3/lib/replace/libreplace_macros.m4
+++ b/source3/lib/replace/libreplace_macros.m4
@@ -87,19 +87,6 @@ fi
 rm -f conftest*
 ])])
 
-AC_DEFUN([AC_EXTENSION_FLAG],
-[
-  cat >>confdefs.h <<\EOF
-#ifndef $1
-# define $1 1
-#endif
-EOF
-AH_VERBATIM([$1], [#ifndef $1
-# define $1 1
-#endif])
-])
-
-
 dnl see if a declaration exists for a function or variable
 dnl defines HAVE_function_DECL if it exists
 dnl AC_HAVE_DECL(var, includes)
-- 
cgit