r15002: More cleanups in build/m4/rewrite.m4

(This used to be commit f5e2cc845696b56b9cb6a6c3cad48cd57fcc51c4)

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index f6897dd9240863f38a4f0d7fef9ebacee43f6dd6..5bb02835bf2d94d16e3ee0aa6a29ed6878eec09d 100644 (file)
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -299,26 +299,6 @@ if test $ac_cv_shlib_works = no; then
 fi
 fi
 
-AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[
-AC_TRY_RUN([
-#include <sys/time.h>
-#include <unistd.h>
-main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
-           samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,samba_cv_HAVE_GETTIMEOFDAY_TZ=no,samba_cv_HAVE_GETTIMEOFDAY_TZ=cross)])
-if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
-    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
-fi
-
-
-AC_CACHE_CHECK([for utimbuf],samba_cv_HAVE_UTIMBUF,[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <utime.h>],
-[struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));],
-samba_cv_HAVE_UTIMBUF=yes,samba_cv_HAVE_UTIMBUF=no,samba_cv_HAVE_UTIMBUF=cross)])
-if test x"$samba_cv_HAVE_UTIMBUF" = x"yes"; then
-    AC_DEFINE(HAVE_UTIMBUF,1,[Whether struct utimbuf is available])
-fi
-
 AC_CACHE_CHECK([for Linux kernel oplocks],samba_cv_HAVE_KERNEL_OPLOCKS_LINUX,[
 AC_TRY_RUN([
 #include <sys/types.h>
@@ -404,26 +384,6 @@ if test x"$samba_cv_HAVE_MMAP" = x"yes"; then
     AC_DEFINE(HAVE_MMAP,1,[Whether mmap works])
 fi
 
-AC_CACHE_CHECK([for st_blocks in struct stat],samba_cv_HAVE_STAT_ST_BLOCKS,[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>],
-[struct stat st;  st.st_blocks = 0;],
-samba_cv_HAVE_STAT_ST_BLOCKS=yes,samba_cv_HAVE_STAT_ST_BLOCKS=no,samba_cv_HAVE_STAT_ST_BLOCKS=cross)])
-if test x"$samba_cv_HAVE_STAT_ST_BLOCKS" = x"yes"; then
-    AC_DEFINE(HAVE_STAT_ST_BLOCKS,1,[Whether the stat struct has a st_block property])
-fi 
-
-AC_CACHE_CHECK([for st_blksize in struct stat],samba_cv_HAVE_STAT_ST_BLKSIZE,[
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>],
-[struct stat st;  st.st_blksize = 0;],
-samba_cv_HAVE_STAT_ST_BLKSIZE=yes,samba_cv_HAVE_STAT_ST_BLKSIZE=no,samba_cv_HAVE_STAT_ST_BLKSIZE=cross)])
-if test x"$samba_cv_HAVE_STAT_ST_BLKSIZE" = x"yes"; then
-    AC_DEFINE(HAVE_STAT_ST_BLKSIZE,1,[Whether the stat struct has a st_blksize property])
-fi
-
 case "$host_os" in
 *linux*)
 AC_CACHE_CHECK([for broken RedHat 7.2 system header files],samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS,[

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index a4fcd47bb5e6304985b6e7e15de0d701dcbda97f..ebd595c9992bf57b53fcf0a3dd4668418ce50a81 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -2,7 +2,6 @@
  - fix module loading for selftest during non-developer builds
 - per-subsystem CFLAGS (which are inherited)
 - clearer distinction between dcerpc and ndr. seperate interface tables?
-- pregenerate more stuff (IDL, manpages, lex/yacc?)
 - saner names for:
        libcli.so.0.0.1 (rename to libsmb?)
        libcli_cldap.so.0.0.1 (rename to libcldap?)

diff --git a/source4/configure.in b/source4/configure.in
index 9ef45e26862fc0fb32a47f6395f7c7cc8a7a3d93..9c52e0bd37199ab29c72bd3327b65c97563c2ad3 100644 (file)
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -18,6 +18,7 @@ sinclude(lib/replace/repdir/config.m4)
 sinclude(heimdal_build/config.m4)
 sinclude(lib/util/fsusage.m4)
 sinclude(lib/util/capability.m4)
+sinclude(lib/util/time.m4)
 sinclude(lib/popt/config.m4)
 sinclude(lib/charset/config.m4)
 sinclude(lib/socket/config.m4)

diff --git a/source4/lib/util/time.m4 b/source4/lib/util/time.m4
new file mode 100644 (file)
index 0000000..f61ae4c
--- /dev/null
+++ b/source4/lib/util/time.m4
@@ -0,0 +1,9 @@
+AC_CACHE_CHECK([if gettimeofday takes tz argument],samba_cv_HAVE_GETTIMEOFDAY_TZ,[
+AC_TRY_RUN([
+#include <sys/time.h>
+#include <unistd.h>
+main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
+           samba_cv_HAVE_GETTIMEOFDAY_TZ=yes,samba_cv_HAVE_GETTIMEOFDAY_TZ=no,samba_cv_HAVE_GETTIMEOFDAY_TZ=cross)])
+if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
+fi