svn commit: samba r21388 - in branches/SAMBA_3_0: . source/lib/replace

[jelmer at samba.org]

Author: jelmer
Date: 2007-02-16 15:35:26 +0000 (Fri, 16 Feb 2007)
New Revision: 21388

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

Log:
Merge support for providing replacement system headers.
Modified:
   branches/SAMBA_3_0/
   branches/SAMBA_3_0/source/lib/replace/README
   branches/SAMBA_3_0/source/lib/replace/libreplace.m4
   branches/SAMBA_3_0/source/lib/replace/libreplace_macros.m4


Changeset:

Property changes on: branches/SAMBA_3_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2
jelmer at samba.org-20070116182350-dq986bj4yj3m4s12
jelmer at samba.org-20070118101400-trvls9ul7o9f0j7y
jelmer at samba.org-20070206225320-l6zta3y928rbh5bk
jelmer at samba.org-20070216144754-yuizh6f7xn03o4n7

   + jelmer at samba.org-20060718161613-53e1c111cabecd57
jelmer at samba.org-20060729112811-c224341dc6387f22
jelmer at samba.org-20060824202535-0923b9ac63b0de61
jelmer at samba.org-20060824205058-95b956f158533304
jelmer at samba.org-20060824220658-230fbfb53bdad5e7
jelmer at samba.org-20060824220942-b7a63fab1a82825e
jelmer at samba.org-20060824232016-69881278506065b0
jelmer at samba.org-20060825031555-18b374fbcabd3b04
jelmer at samba.org-20060906183058-bd444ea54d961569
jelmer at samba.org-20070116153619-w9vubayci8fujmes
jelmer at samba.org-20070116174619-tx8yabv4p50jlqp2
jelmer at samba.org-20070116182350-dq986bj4yj3m4s12
jelmer at samba.org-20070118101400-trvls9ul7o9f0j7y
jelmer at samba.org-20070206225320-l6zta3y928rbh5bk
jelmer at samba.org-20070216144754-yuizh6f7xn03o4n7
jelmer at samba.org-20070216153310-1104i8xz3sl68pup


Modified: branches/SAMBA_3_0/source/lib/replace/README
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/README	2007-02-16 15:13:57 UTC (rev 21387)
+++ branches/SAMBA_3_0/source/lib/replace/README	2007-02-16 15:35:26 UTC (rev 21388)
@@ -81,6 +81,10 @@
 MAX
 QSORT_CAST
 
+Headers:
+stdint.h
+stdbool.h
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)

Modified: branches/SAMBA_3_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-02-16 15:13:57 UTC (rev 21387)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace.m4	2007-02-16 15:35:26 UTC (rev 21388)
@@ -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/source/lib/replace/libreplace_macros.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/libreplace_macros.m4	2007-02-16 15:13:57 UTC (rev 21387)
+++ branches/SAMBA_3_0/source/lib/replace/libreplace_macros.m4	2007-02-16 15:35:26 UTC (rev 21388)
@@ -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]) ]
+	)
+])
+
+