From e997a767aae255992b0f1d229d15eb4f2b00484c Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 6 Sep 2006 08:30:56 +0000
Subject: r18145: rename cc_feature.m4 into libreplace_macros.m4

metze
(This used to be commit d0f40dd3e5ca8b46ee9b2c4332b393f519383aae)
---
 source4/lib/replace/libreplace_macros.m4 | 53 ++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 source4/lib/replace/libreplace_macros.m4

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
new file mode 100644
index 0000000000..255009dd55
--- /dev/null
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -0,0 +1,53 @@
+dnl C99 compiler check
+dnl -------------------------------------------------------
+dnl  Copyright (C) Stefan (metze) Metzmacher 2004,2005
+dnl  Released under the GNU GPL
+dnl -------------------------------------------------------
+dnl
+dnl adapted for libreplace by Andrew Tridgell
+
+############################################
+# Check if the compiler handles c99 struct initialization, and if not try -AC99 and -c99 flags
+# Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
+# changes CFLAGS to add -AC99 or -c99 if needed
+
+AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
+[
+saved_CFLAGS="$CFLAGS";
+c99_init=no
+if test x"$c99_init" = x"no"; then
+    AC_MSG_CHECKING(for C99 designated initializers)
+    CFLAGS="$saved_CFLAGS";
+    AC_TRY_COMPILE([#include <stdio.h>],
+     [ struct foo {int x;char y;};
+       struct foo bar = { .y = 'X', .x = 1 };	 
+     ],
+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
+if test x"$c99_init" = x"no"; then
+    AC_MSG_CHECKING(for C99 designated initializers with -AC99)
+    CFLAGS="$saved_CFLAGS -AC99";
+    AC_TRY_COMPILE([#include <stdio.h>],
+     [ struct foo {int x;char y;};
+       struct foo bar = { .y = 'X', .x = 1 };	 
+     ],
+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
+if test x"$c99_init" = x"no"; then
+    AC_MSG_CHECKING(for C99 designated initializers with -c99)
+    CFLAGS="$saved_CFLAGS -c99"
+    AC_TRY_COMPILE([#include <stdio.h>],
+     [ struct foo {int x;char y;};
+       struct foo bar = { .y = 'X', .x = 1 };	 
+     ],
+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
+if test x"$c99_init" = x"yes"; then
+    saved_CFLAGS=""
+    $1
+else
+    CFLAGS="$saved_CFLAGS"
+    saved_CFLAGS=""
+    $2
+fi
+])
-- 
cgit 


From 6150443532ef714fcd060e4fe384db11552eb673 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 6 Sep 2006 09:52:16 +0000
Subject: r18152: move our AC macros into lib/replace/libreplace_macros.m4 and
 include them from there

metze
(This used to be commit 38f9e90a120b4e62f005a1bac89139ee87f63071)
---
 source4/lib/replace/libreplace_macros.m4 | 187 +++++++++++++++++++++++++++++--
 1 file changed, 179 insertions(+), 8 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 255009dd55..9cf06c1a37 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -1,16 +1,11 @@
-dnl C99 compiler check
-dnl -------------------------------------------------------
-dnl  Copyright (C) Stefan (metze) Metzmacher 2004,2005
-dnl  Released under the GNU GPL
-dnl -------------------------------------------------------
-dnl
-dnl adapted for libreplace by Andrew Tridgell
+#
+# This is a collection of useful autoconf macros
+#
 
 ############################################
 # Check if the compiler handles c99 struct initialization, and if not try -AC99 and -c99 flags
 # Usage: LIBREPLACE_C99_STRUCT_INIT(success-action,failure-action)
 # changes CFLAGS to add -AC99 or -c99 if needed
-
 AC_DEFUN([LIBREPLACE_C99_STRUCT_INIT],
 [
 saved_CFLAGS="$CFLAGS";
@@ -51,3 +46,179 @@ else
     $2
 fi
 ])
+
+dnl AC_PROG_CC_FLAG(flag)
+AC_DEFUN(AC_PROG_CC_FLAG,
+[AC_CACHE_CHECK(whether ${CC-cc} accepts -$1, ac_cv_prog_cc_$1,
+[echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -$1 -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_$1=yes
+else
+  ac_cv_prog_cc_$1=no
+fi
+rm -f conftest*
+])])
+
+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)
+AC_DEFUN(AC_HAVE_DECL,
+[
+ AC_CACHE_CHECK([for $1 declaration],ac_cv_have_$1_decl,[
+    AC_TRY_COMPILE([$2],[int i = (int)$1],
+        ac_cv_have_$1_decl=yes,ac_cv_have_$1_decl=no)])
+ if test x"$ac_cv_have_$1_decl" = x"yes"; then
+    AC_DEFINE([HAVE_]translit([$1], [a-z], [A-Z])[_DECL],1,[Whether $1() is available])
+ fi
+])
+
+
+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
+# ------------------------------------------------------
+#
+# Use a cache variable name containing both the library and function name,
+# because the test really is for library $1 defining function $3, not
+# just for library $1.  Separate tests with the same $1 and different $3s
+# may have different results.
+#
+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
+# is asking for trouble, since AC_CHECK_LIB($lib, fun) would give
+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
+# the AS_LITERAL_IF indirection.
+#
+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionally,
+# whatever the FUNCTION, in addition to not being a *S macro.  Note
+# that the cache does depend upon the function we are looking for.
+#
+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
+# freedom.
+AC_DEFUN([AC_CHECK_LIB_EXT],
+[
+AH_CHECK_LIB_EXT([$1])
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-l$1 $$2 $7 $LIBS"
+AS_LITERAL_IF([$1],
+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
+
+m4_ifval([$3],
+ [
+    AH_CHECK_FUNC_EXT([$3])
+    AS_LITERAL_IF([$1],
+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
+    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
+	[AC_TRY_LINK_FUNC($3,
+                 [AS_VAR_SET(ac_Lib_func, yes);
+		  AS_VAR_SET(ac_Lib_ext, yes)],
+                 [AS_VAR_SET(ac_Lib_func, no);
+		  AS_VAR_SET(ac_Lib_ext, no)])
+	])
+    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
+    AS_VAR_POPDEF([ac_Lib_func])dnl
+ ],[
+    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
+	[AC_TRY_LINK_FUNC([main],
+                 [AS_VAR_SET(ac_Lib_ext, yes)],
+                 [AS_VAR_SET(ac_Lib_ext, no)])
+	])
+ ])
+LIBS=$ac_check_lib_ext_save_LIBS
+
+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
+    [m4_default([$4], 
+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
+		case "$$2" in
+		    *-l$1*)
+			;;
+		    *)
+			$2="-l$1 $$2"
+			;;
+		esac])
+		[$6]
+	    ],
+	    [$5])dnl
+AS_VAR_POPDEF([ac_Lib_ext])dnl
+])# AC_CHECK_LIB_EXT
+
+# AH_CHECK_LIB_EXT(LIBNAME)
+# ---------------------
+m4_define([AH_CHECK_LIB_EXT],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
+             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
+
+dnl AC_SEARCH_LIBS_EXT(FUNCTION, SEARCH-LIBS, EXT_LIBS,
+dnl                    [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+dnl                    [OTHER-LIBRARIES])
+dnl --------------------------------------------------------
+dnl Search for a library defining FUNC, if it's not already available.
+AC_DEFUN([AC_SEARCH_LIBS_EXT],
+[AC_CACHE_CHECK([for library containing $1], [ac_cv_search_ext_$1],
+[
+ac_func_search_ext_save_LIBS=$LIBS
+ac_cv_search_ext_$1=no
+AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
+	       [ac_cv_search_ext_$1="none required"])
+if test "$ac_cv_search_ext_$1" = no; then
+  for ac_lib in $2; do
+    LIBS="-l$ac_lib $$3 $6 $ac_func_search_save_ext_LIBS"
+    AC_LINK_IFELSE([AC_LANG_CALL([], [$1])],
+		   [ac_cv_search_ext_$1="-l$ac_lib"
+break])
+  done
+fi
+LIBS=$ac_func_search_ext_save_LIBS])
+AS_IF([test "$ac_cv_search_ext_$1" != no],
+  [test "$ac_cv_search_ext_$1" = "none required" || $3="$ac_cv_search_ext_$1 $$3"
+  $4],
+      [$5])dnl
+])
+
+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
+AC_DEFUN([AC_CHECK_FUNC_EXT],
+[
+    AH_CHECK_FUNC_EXT($1)	
+    ac_check_func_ext_save_LIBS=$LIBS
+    LIBS="$2 $LIBS"
+    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
+    AC_CACHE_CHECK([for $1], ac_var,
+	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
+                [AS_VAR_SET(ac_var, yes)],
+                [AS_VAR_SET(ac_var, no)])])
+    LIBS=$ac_check_func_ext_save_LIBS
+    AS_IF([test AS_VAR_GET(ac_var) = yes], 
+	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
+	    [$4])dnl
+AS_VAR_POPDEF([ac_var])dnl
+])# AC_CHECK_FUNC
+
+# AH_CHECK_FUNC_EXT(FUNCNAME)
+# ---------------------
+m4_define([AH_CHECK_FUNC_EXT],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
+             [Define to 1 if you have the `]$1[' function.])])
+
+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]
+EOF
+])
+
+dnl Add an #include
+dnl AC_ADD_INCLUDE(VARIABLE)
+define(AC_ADD_INCLUDE,
+[cat >> confdefs.h <<\EOF
+[#include] $1
+EOF
+])
-- 
cgit 


From b7f937bdbbb419c85c2fe2682dc48aa247b621fc Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 7 Sep 2006 10:50:33 +0000
Subject: r18216: a special override for the broken HP-UX C compiler. It does
 support C99 initialisers without any flags, but if you don't give it -AC99
 then it dies when those initialisers are very complex (This used to be commit
 46f72d7e3f285d08a043b4e8551f22c4dffe65e5)

---
 source4/lib/replace/libreplace_macros.m4 | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 9cf06c1a37..a50104cd1c 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -37,6 +37,16 @@ if test x"$c99_init" = x"no"; then
      ],
      [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
 fi
+
+if test "`uname`" = "HP-UX"; then
+  if test "$ac_cv_c_compiler_gnu" = no; then
+	# special override for broken HP-UX compiler - I can't find a way to test
+	# this properly (its a compiler bug)
+	CFLAGS="$CFLAGS -AC99";
+	c99_init=yes;
+  fi
+fi
+
 if test x"$c99_init" = x"yes"; then
     saved_CFLAGS=""
     $1
-- 
cgit 


From 05f98cdbfc64b549f4530a5e6aba0dcf3f536a87 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 9 Sep 2006 03:45:04 +0000
Subject: r18287: add support for the -qlanglvl=extc99 and -qlanglvl=stdc99
 flags, needed on AIX 5.2 for C99 structures (This used to be commit
 2dc9239a3621f48fbb410a60fee61d70f85ada91)

---
 source4/lib/replace/libreplace_macros.m4 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index a50104cd1c..03ef97d157 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -28,6 +28,24 @@ if test x"$c99_init" = x"no"; then
      ],
      [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
 fi
+if test x"$c99_init" = x"no"; then
+    AC_MSG_CHECKING(for C99 designated initializers with -qlanglvl=extc99)
+    CFLAGS="$saved_CFLAGS -qlanglvl=extc99";
+    AC_TRY_COMPILE([#include <stdio.h>],
+     [ struct foo {int x;char y;};
+       struct foo bar = { .y = 'X', .x = 1 };	 
+     ],
+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
+if test x"$c99_init" = x"no"; then
+    AC_MSG_CHECKING(for C99 designated initializers with -qlanglvl=stdc99)
+    CFLAGS="$saved_CFLAGS -qlanglvl=stdc99";
+    AC_TRY_COMPILE([#include <stdio.h>],
+     [ struct foo {int x;char y;};
+       struct foo bar = { .y = 'X', .x = 1 };	 
+     ],
+     [AC_MSG_RESULT(yes); c99_init=yes],[AC_MSG_RESULT(no)])
+fi
 if test x"$c99_init" = x"no"; then
     AC_MSG_CHECKING(for C99 designated initializers with -c99)
     CFLAGS="$saved_CFLAGS -c99"
-- 
cgit 


From 6d8a03b5f5ba42fcfc449b1aaf64f120e42b226f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Sat, 9 Sep 2006 08:34:48 +0000
Subject: r18292: import some autoconf 2.60 specific macros, so that older
 autoconf versions still work

metze
(This used to be commit 43970e6d081e56837e38856a9d05c8b9c303955e)
---
 source4/lib/replace/libreplace_macros.m4 | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 03ef97d157..71ef64337b 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -250,3 +250,5 @@ define(AC_ADD_INCLUDE,
 [#include] $1
 EOF
 ])
+
+m4_include(autoconf-2.60.m4)
-- 
cgit 


From 3de6b469ccadfbaa0c16535c3f17049ffb96aef1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 13 Sep 2006 16:15:38 +0000
Subject: r18479: start hiding libreplace configure tests behind macros

AC_LIBREPLACE_CC_CHECKS
AC_LIBREPLACE_BROKEN_CHECKS
and
AC_LIBREPLACE_ALL_CHECKS
which calls the 2 others

I'll add some more, so that samba3/samba4 can later call
them in the wanted order and all standalone builds
use AC_LIBREPLACE_ALL_CHECKS.

metze
(This used to be commit e7a30456c76f4bf9a79cdcff6b15c894bc20c954)
---
 source4/lib/replace/libreplace_macros.m4 | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 71ef64337b..67a770c9e2 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -251,4 +251,6 @@ define(AC_ADD_INCLUDE,
 EOF
 ])
 
+m4_include(libreplace_cc.m4)
 m4_include(autoconf-2.60.m4)
+
-- 
cgit 


From d08fb7b1cc39f4fa92045a4789fcf6182caba907 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 13 Sep 2006 16:51:45 +0000
Subject: r18485: include libreplace.m4 in the aclocal.m4 files and use the
 macros in configure.ac

metze
(This used to be commit 95d33e4d71b4c97af8413bcd136f393aa3e380dd)
---
 source4/lib/replace/libreplace_macros.m4 | 3 ---
 1 file changed, 3 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 67a770c9e2..6c1110dc4b 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -251,6 +251,3 @@ define(AC_ADD_INCLUDE,
 EOF
 ])
 
-m4_include(libreplace_cc.m4)
-m4_include(autoconf-2.60.m4)
-
-- 
cgit 


From 6fa6c74d5959471a2b8d07a2e1e508d299bc2b8d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Sep 2006 22:31:25 +0000
Subject: r18488: we have to make sure any extensions flags also make it into
 confdefs.h, otherwise the real build and the configure tests will not be
 significant

this change fixes the build of libreplace on hpux with gcc
(This used to be commit d37fc315325c93414ce0942d28f0f47b42873b95)
---
 source4/lib/replace/libreplace_macros.m4 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 6c1110dc4b..6c4cfc465d 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -87,6 +87,19 @@ fi
 rm -f conftest*
 ])])
 
+AC_DEFUN([AC_EXTENSION_FLAG],
+[
+  cat >>confdefs.h <<\EOF
+#ifndef $1
+# define $1
+#endif
+EOF
+AH_VERBATIM([$1], [#ifndef $1
+# define $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 


From fd6030eac7d0c71106e2f83579d6d2f30e1b5f96 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 13 Sep 2006 23:13:32 +0000
Subject: r18490: on irix _XOPEN_SOURCE_EXTENDED needs to be defined to 1, not
 just defined (This used to be commit
 39d984738b1931e16cb0e6abfdb58108fc97da90)

---
 source4/lib/replace/libreplace_macros.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 6c4cfc465d..913de5eab1 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -91,11 +91,11 @@ AC_DEFUN([AC_EXTENSION_FLAG],
 [
   cat >>confdefs.h <<\EOF
 #ifndef $1
-# define $1
+# define $1 1
 #endif
 EOF
 AH_VERBATIM([$1], [#ifndef $1
-# define $1
+# define $1 1
 #endif])
 ])
 
-- 
cgit 


From a9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 14 Sep 2006 07:30:46 +0000
Subject: r18503: - _GNU_SOURCE is defined by libreplace - move AS_HELP_STRING
 replacement to libreplace

metze
(This used to be commit ace406a36ebbed230bf6c844e4639bac5e6c9882)
---
 source4/lib/replace/libreplace_macros.m4 | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 913de5eab1..41ec03f07a 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -264,3 +264,7 @@ define(AC_ADD_INCLUDE,
 EOF
 ])
 
+dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is deprecated
+dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already
+dnl defined.
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-- 
cgit 


From a0e87e5dc79bc631cb2362ebbf4d91913a342273 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 14 Sep 2006 08:26:41 +0000
Subject: r18505: add configure checks for telldir() and seekdir()

telldir() is different on older OpenBSD versions
seekdir() is different Tru64

tridge: OpenBSD seems to like this replacement:-)
        while MAC OS 10 gets 134 runtime error:-(
	lets wait what Tru64 will give

metze
(This used to be commit 1f4e602ff239b7feabb2dd1d6938dedf91bde5cd)
---
 source4/lib/replace/libreplace_macros.m4 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 41ec03f07a..91f816c75d 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -268,3 +268,23 @@ dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is depr
 dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already
 dnl defined.
 m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
+dnl check if the prototype in the header matches the given one
+dnl AC_VERIFY_C_PROTOTYPE(prototype,functionbody,[IF-TRUE].[IF-FALSE],[extraheaders])
+AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
+[AC_CACHE_CHECK([for prototype $1], AS_TR_SH([ac_cv_c_prototype_$1]),
+	AC_COMPILE_IFELSE([
+		AC_INCLUDES_DEFAULT
+		$5
+		$1
+		{
+			$2
+		}
+	],[
+		AS_TR_SH([ac_cv_c_prototype_$1])=yes
+		$3
+	],[
+		AS_TR_SH([ac_cv_c_prototype_$1])=no
+		$4
+	])
+)])
-- 
cgit 


From cbb1975c8caa4277b0d1cad7e8427dc241cf2958 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 14 Sep 2006 10:34:03 +0000
Subject: r18514: fix configure caching of AC_VERIFY_C_PROTOTYPE() macro

metze
(This used to be commit 8e49dc69e7d588c85c9e9e7b24b595c61c1da95a)
---
 source4/lib/replace/libreplace_macros.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 91f816c75d..4a645ef81f 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -282,9 +282,9 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
 		}
 	],[
 		AS_TR_SH([ac_cv_c_prototype_$1])=yes
-		$3
 	],[
 		AS_TR_SH([ac_cv_c_prototype_$1])=no
-		$4
 	])
-)])
+)
+AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
+])
-- 
cgit 


From 2bdaccaa9c794f901ddd10b57b67b8aa21ef5285 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 11 Oct 2006 13:36:37 +0000
Subject: r19245: mrege from samba3:

add AC_REMOVE_INCLUDE(), AC_REMOVE_DEFINE() macros

metze
(This used to be commit dc65a6625295a7316c2e9982ee09eb9607dbed70)
---
 source4/lib/replace/libreplace_macros.m4 | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 4a645ef81f..0669c10c2a 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -264,6 +264,24 @@ define(AC_ADD_INCLUDE,
 EOF
 ])
 
+dnl remove an #include
+dnl AC_REMOVE_INCLUDE(VARIABLE)
+define(AC_REMOVE_INCLUDE,
+[
+grep -v '[#include] $1' confdefs.h >confdefs.h.tmp
+cat confdefs.h.tmp > confdefs.h
+rm confdefs.h.tmp
+])
+
+dnl remove an #define
+dnl AC_REMOVE_DEFINE(VARIABLE)
+define(AC_REMOVE_DEFINE,
+[
+grep -v '[#define] $1 ' confdefs.h |grep -v '[#define] $1[$]'>confdefs.h.tmp
+cat confdefs.h.tmp > confdefs.h
+rm confdefs.h.tmp
+])
+
 dnl AS_HELP_STRING is not available in autoconf 2.57, and AC_HELP_STRING is deprecated
 dnl in autoconf 2.59, so define AS_HELP_STRING to be AC_HELP_STRING unless it is already
 dnl defined.
-- 
cgit 


From 4126b34e1f34a67b1eed06329530c17dfa54fb00 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 12 Feb 2007 17:36:00 +0000
Subject: r21302: Provide simple redirecting headers for standard headers.
 (This used to be commit 74c47839536c9ccfa1240289d20df65d9d13839d)

---
 source4/lib/replace/libreplace_macros.m4 | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 0669c10c2a..f262b9b6eb 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -306,3 +306,12 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
 )
 AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4])
 ])
+
+AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, 
+[AC_CHECK_HEADER([$1], 
+		[ AC_CONFIG_COMMANDS(rm-$1, [rm -f $libreplacedir/$1], [libreplacedir=$libreplacedir]) ],
+		[ AC_CONFIG_COMMANDS(mk-$1, [echo "#include \"replace.h\"" > $libreplacedir/$1], [libreplacedir=$libreplacedir]) ]
+	)
+])
+
+
-- 
cgit 


From 1a766af41e9e3bdffc343098c2ec1b5018b33a26 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 18 Oct 2007 08:34:19 +0200
Subject: r25695: [libreplace] fix the standalone build of libreplace

all configure results which are used in replace.h
or any system/*.h should be in the in the libreplace
*.m4 files!

metze
(This used to be commit 95462d614d68a93e85232e3a779f8bfa86fba4d1)
---
 source4/lib/replace/libreplace_macros.m4 | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index f262b9b6eb..da46f6734f 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -314,4 +314,25 @@ AC_DEFUN(LIBREPLACE_PROVIDE_HEADER,
 	)
 ])
 
-
+dnl AC_HAVE_TYPE(TYPE,INCLUDES)
+AC_DEFUN([AC_HAVE_TYPE], [
+AC_REQUIRE([AC_HEADER_STDC])
+cv=`echo "$1" | sed 'y%./+- %__p__%'`
+AC_MSG_CHECKING(for $1)
+AC_CACHE_VAL([ac_cv_type_$cv],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_INCLUDES_DEFAULT
+$2]],
+[[$1 foo;]])],
+[eval "ac_cv_type_$cv=yes"],
+[eval "ac_cv_type_$cv=no"]))dnl
+ac_foo=`eval echo \\$ac_cv_type_$cv`
+AC_MSG_RESULT($ac_foo)
+if test "$ac_foo" = yes; then
+  ac_tr_hdr=HAVE_`echo $1 | sed 'y%abcdefghijklmnopqrstuvwxyz./- %ABCDEFGHIJKLMNOPQRSTUVWXYZ____%'`
+if false; then
+	AC_CHECK_TYPES($1)
+fi
+  AC_DEFINE_UNQUOTED($ac_tr_hdr, 1, [Define if you have type `$1'])
+fi
+])
-- 
cgit 


From 37f6b948b7598ca8c532154f3c9833ea0965e887 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 6 Nov 2007 10:40:07 +0100
Subject: r25870: libreplace: AC_VERIFY_C_PROTOTYPE() needs AC_LANG_SOURCE() to
 bring in confdefs.h

metze
(This used to be commit c6b6466c33ffab2b59e1a275922b6f3a7f2af98c)
---
 source4/lib/replace/libreplace_macros.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index da46f6734f..92fecd3db8 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/lib/replace/libreplace_macros.m4
@@ -291,14 +291,14 @@ dnl check if the prototype in the header matches the given one
 dnl AC_VERIFY_C_PROTOTYPE(prototype,functionbody,[IF-TRUE].[IF-FALSE],[extraheaders])
 AC_DEFUN(AC_VERIFY_C_PROTOTYPE,
 [AC_CACHE_CHECK([for prototype $1], AS_TR_SH([ac_cv_c_prototype_$1]),
-	AC_COMPILE_IFELSE([
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 		AC_INCLUDES_DEFAULT
 		$5
 		$1
 		{
 			$2
 		}
-	],[
+	])],[
 		AS_TR_SH([ac_cv_c_prototype_$1])=yes
 	],[
 		AS_TR_SH([ac_cv_c_prototype_$1])=no
-- 
cgit 


From 0f134fab53489ad254ac23c740bc0a722ffa592c 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
(This used to be commit a07c983fde52607806745914bb41039afb5618cc)
---
 source4/lib/replace/libreplace_macros.m4 | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

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

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


From ae75b115787994540ccf1aa1b384331955384fd9 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
(This used to be commit 05b4619c5beff474488d1abe5e647acd94a3e20c)
---
 source4/lib/replace/libreplace_macros.m4 | 13 -------------
 1 file changed, 13 deletions(-)

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

diff --git a/source4/lib/replace/libreplace_macros.m4 b/source4/lib/replace/libreplace_macros.m4
index 54e6b7ac75..1856eacf66 100644
--- a/source4/lib/replace/libreplace_macros.m4
+++ b/source4/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