libreplace: move gettimeofday TZ arg check here

diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4
index b8568a5165079cd10361a1971061eda0ffa747a3..04364bc3a1d66715df246380e01353ecbe7a3f85 100644 (file)
--- 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 (file)
index 675e201..0000000
--- 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 d8bf5543876a6f06b3943f70e1ba4fbe3fb5a0df..e0dedb3d074b463b663d875efc52e4243b4ff70c 100644 (file)
--- 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 91d7a3be3439db25e57c859922f1f1cd12750d18..f415d0bbb4bcb0a74142499e6e145cca020c74f5 100644 (file)
--- 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)