svn commit: samba r22219 - in branches/SAMBA_3_0_25/source/lib/replace: .

[metze at samba.org]

Author: metze
Date: 2007-04-15 19:23:04 +0000 (Sun, 15 Apr 2007)
New Revision: 22219

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22219

Log:
merge from samba3/4:

merge stdint.h stdbool.h replacement fix to 3.0.25 branch

metze
Modified:
   branches/SAMBA_3_0_25/source/lib/replace/README
   branches/SAMBA_3_0_25/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0_25/source/lib/replace/libreplace_macros.m4


Changeset:
Modified: branches/SAMBA_3_0_25/source/lib/replace/README
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/README	2007-04-15 19:09:34 UTC (rev 22218)
+++ branches/SAMBA_3_0_25/source/lib/replace/README	2007-04-15 19:23:04 UTC (rev 22219)
@@ -80,6 +80,10 @@
 MAX
 QSORT_CAST
 
+Headers:
+stdint.h
+stdbool.h
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)

Modified: branches/SAMBA_3_0_25/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/libreplace.m4	2007-04-15 19:09:34 UTC (rev 22218)
+++ branches/SAMBA_3_0_25/source/lib/replace/libreplace.m4	2007-04-15 19:23:04 UTC (rev 22219)
@@ -61,9 +61,12 @@
 
 AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp)
 
-AC_CHECK_HEADERS(stdbool.h sys/select.h)
+AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h)
 AC_CHECK_HEADERS(setjmp.h)
 
+LIBREPLACE_PROVIDE_HEADER([stdint.h])
+LIBREPLACE_PROVIDE_HEADER([stdbool.h])
+
 AC_CHECK_TYPE(bool, 
 [AC_DEFINE(HAVE_BOOL, 1, [Whether the bool type is available])],,
 [

Modified: branches/SAMBA_3_0_25/source/lib/replace/libreplace_macros.m4
===================================================================
--- branches/SAMBA_3_0_25/source/lib/replace/libreplace_macros.m4	2007-04-15 19:09:34 UTC (rev 22218)
+++ branches/SAMBA_3_0_25/source/lib/replace/libreplace_macros.m4	2007-04-15 19:23:04 UTC (rev 22219)
@@ -306,3 +306,12 @@
 )
 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]) ]
+	)
+])
+
+