r10459: fixed some portability problems

(This used to be commit 03942dd54b31e7a4cf9c6270b26ccf68a3234b40)

diff --git a/source4/lib/tdb/common/tdb_private.h b/source4/lib/tdb/common/tdb_private.h
index ba0a379e7fcb4c796f54c2e9b619daecef41e242..9eeaea4cb08ec8ac11b6d8ae61ff4c37ed73827e 100644 (file)
--- a/source4/lib/tdb/common/tdb_private.h
+++ b/source4/lib/tdb/common/tdb_private.h
@@ -33,7 +33,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>

diff --git a/source4/lib/tdb/config.m4 b/source4/lib/tdb/config.m4
index d45bbe4383322444341a5e76c2c98bcd400e8235..2ebd29993d301bbf8cc84ec7fcab7f3d764e0afb 100644 (file)
--- a/source4/lib/tdb/config.m4
+++ b/source4/lib/tdb/config.m4
@@ -1,4 +1,5 @@
 AC_CHECK_FUNCS(mmap pread pwrite)
+AC_CHECK_HEADERS(getopt.h)
 
 if test x"$experimental" = x"yes"; then
        SMB_LIBRARY_ENABLE(libtdb,YES)

diff --git a/source4/lib/tdb/tools/tdbtorture.c b/source4/lib/tdb/tools/tdbtorture.c
index c0076a92d4602367f00526bba6b2152503cafc9e..591fdab2f761ad8170d208c03fd7837bd4cac41a 100644 (file)
--- a/source4/lib/tdb/tools/tdbtorture.c
+++ b/source4/lib/tdb/tools/tdbtorture.c
@@ -30,7 +30,10 @@
 
 #endif
 
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+
 
 #define REOPEN_PROB 30
 #define DELETE_PROB 8