diff options
| author | Björn Jacke <bj@sernet.de> | 2010-08-30 14:35:49 +0200 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-08-31 09:07:08 +0200 |
| commit | e8662248c8bf7dfc830ce34f301f30f59e600cd8 (patch) | |
| tree | e78e8c148fe67ec2823b9dfba2732ea60c53f449 | |
| parent | c2e2be51a64dab19b001bddb39341a035ba6a2a1 (diff) | |
| download | samba-e8662248c8bf7dfc830ce34f301f30f59e600cd8.tar.gz samba-e8662248c8bf7dfc830ce34f301f30f59e600cd8.tar.bz2 samba-e8662248c8bf7dfc830ce34f301f30f59e600cd8.zip | |
libreplace: move gettimeofday TZ arg check here
| -rw-r--r-- | lib/replace/system/config.m4 | 10 | ||||
| -rw-r--r-- | lib/util/time.m4 | 9 | ||||
| -rw-r--r-- | source3/configure.in | 1 | ||||
| -rw-r--r-- | source4/configure.ac | 1 |
4 files changed, 10 insertions, 11 deletions
diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4 index b8568a5165..04364bc3a1 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 675e20129f..0000000000 --- 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 d8bf554387..e0dedb3d07 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 91d7a3be34..f415d0bbb4 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) |