Rev 5223: Merge support for providing replacement system headers. in file:///home/jelmer/bzr.samba/SAMBA_3_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_3_0/

------------------------------------------------------------
revno: 5223
revision-id: jelmer at samba.org-20070216153310-1104i8xz3sl68pup
parent: svn-v2:21387 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_3_0
timestamp: Fri 2007-02-16 16:33:10 +0100
message:
  Merge support for providing replacement system headers.
modified:
  source/lib/replace/README      svn-v2:18644 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flib%2freplace%2fREADME
  source/lib/replace/libreplace.m4 svn-v2:18644 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flib%2freplace%2flibreplace.m4
  source/lib/replace/libreplace_macros.m4 svn-v2:18644 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_3_0-source%2flib%2freplace%2flibreplace_macros.m4
=== modified file 'source/lib/replace/README'
--- a/source/lib/replace/README	2007-01-15 19:10:54 +0000
+++ b/source/lib/replace/README	2007-02-16 15:33:10 +0000
@@ -81,6 +81,10 @@
 MAX
 QSORT_CAST
 
+Headers:
+stdint.h
+stdbool.h
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)

=== modified file 'source/lib/replace/libreplace.m4'
--- a/source/lib/replace/libreplace.m4	2007-01-15 19:10:54 +0000
+++ b/source/lib/replace/libreplace.m4	2007-02-16 15:33:10 +0000
@@ -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 file 'source/lib/replace/libreplace_macros.m4'
--- a/source/lib/replace/libreplace_macros.m4	2006-10-11 13:31:00 +0000
+++ b/source/lib/replace/libreplace_macros.m4	2007-02-16 15:33:10 +0000
@@ -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]) ]
+	)
+])
+
+