From 62620a5fdc32a120fa4b895e7286608cb5345870 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
Date: Mon, 30 Aug 2010 14:35:49 +0200
Subject: [PATCH] libreplace: move gettimeofday TZ arg check here

---
 lib/replace/system/config.m4 | 10 ++++++++++
 lib/util/time.m4             |  9 ---------
 source3/configure.in         |  1 -
 source4/configure.ac         |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 lib/util/time.m4

diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index b8568a51650..04364bc3a1d 100644
--- a/lib/replace/system/config.m4
+++ b/lib/replace/system/config.m4
@@ -11,6 +11,16 @@ AC_CHECK_HEADERS(sys/time.h utime.h)
 AC_HEADER_TIME
 AC_CHECK_FUNCS(utime utimes)
 
+AC_CACHE_CHECK([if gettimeofday takes TZ argument],libreplace_cv_HAVE_GETTIMEOFDAY_TZ,[
+AC_TRY_RUN([
+#include <sys/time.h>
+#include <unistd.h>
+main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}],
+           libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=no,libreplace_cv_HAVE_GETTIMEOFDAY_TZ=yes)])
+if test x"$libreplace_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
+    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
+fi
+
 # wait
 AC_HEADER_SYS_WAIT
 
diff --git a/lib/util/time.m4 b/lib/util/time.m4
deleted file mode 100644
index 675e20129fc..00000000000
--- a/lib/util/time.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-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=yes)])
-if test x"$samba_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then
-    AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
-fi
diff --git a/source3/configure.in b/source3/configure.in
index d28524f28b2..cef9f507b64 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -121,7 +121,6 @@ fi
 
 m4_include(../lib/socket_wrapper/config.m4)
 m4_include(../lib/nss_wrapper/config.m4)
-m4_include(../lib/util/time.m4)
 
 m4_include(m4/swat.m4)
 
diff --git a/source4/configure.ac b/source4/configure.ac
index 91d7a3be343..f415d0bbb4b 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -20,7 +20,6 @@ m4_include(../lib/util/util.m4)
 m4_include(../lib/util/fsusage.m4)
 m4_include(../lib/util/xattr.m4)
 m4_include(../lib/util/capability.m4)
-m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
 m4_include(../lib/util/charset/config.m4)
 m4_include(lib/socket/config.m4)
-- 
2.11.4.GIT