Remove duplicate check for volatile, move all utime-checks to

libreplace.

diff --git a/lib/replace/README b/lib/replace/README
index 4d94317c4b024f4d0f4f4abb9f99dff38d8d279a..2f3b37340fc7451688ac391b945fe58856d3b541 100644 (file)
--- a/lib/replace/README
+++ b/lib/replace/README
@@ -72,6 +72,7 @@ uint_t
 uint{8,16,32,64}_t
 int{8,16,32,64}_t
 intptr_t
+sig_atomic_t
 
 Constants:
 PATH_NAME_MAX
@@ -107,6 +108,9 @@ Headers:
 stdint.h
 stdbool.h
 
+Optional C keywords:
+volatile
+
 Prerequisites:
 memset (for bzero)
 syslog (for vsyslog)

diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 05e73fb5697d82bca4651eab4526a7ba77ab6146..5e13d4a47ec89a561aa0a8ea50a80f0c28d59cc0 100644 (file)
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -64,10 +64,10 @@ AC_CHECK_TYPE(offset_t,loff_t)
 
 AC_FUNC_MEMCMP
 
-AC_CHECK_FUNCS(pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp)
+AC_CHECK_FUNCS([pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes])
 
 AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h)
-AC_CHECK_HEADERS(setjmp.h)
+AC_CHECK_HEADERS(setjmp.h utime.h)
 
 LIBREPLACE_PROVIDE_HEADER([stdint.h])
 LIBREPLACE_PROVIDE_HEADER([stdbool.h])

diff --git a/source3/configure.in b/source3/configure.in
index cd849349c082f8b7ab9c1941beb776cf84d4ce47..292ae070d63bfbdf0aa13c4ea53e137702c8c88c 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -314,14 +314,6 @@ fi
 fi
 fi
 
-dnl Check if the C compiler understands volatile (it should, being ANSI).
-AC_CACHE_CHECK([that the C compiler understands volatile],samba_cv_volatile, [
-    AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
-       samba_cv_volatile=yes,samba_cv_volatile=no)])
-if test x"$samba_cv_volatile" = x"yes"; then
-   AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
-fi
-
 ############################################
 # check if the compiler can handle negative enum values
 # and don't truncate the values to INT_MAX
@@ -661,7 +653,7 @@ AUTH_LIBS="${AUTH_LIBS} ${CRYPT_LIBS}"
 
 
 AC_CHECK_HEADERS(aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h rpc/nettype.h)
-AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h memory.h alloca.h)
+AC_CHECK_HEADERS(unistd.h grp.h sys/id.h memory.h alloca.h)
 AC_CHECK_HEADERS(limits.h float.h pthread.h)
 AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h)
 AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h)
@@ -1035,7 +1027,7 @@ fi
 
 AC_CHECK_FUNCS(waitpid getcwd strdup strndup strnlen strerror chown fchown lchown chmod fchmod chroot link mknod mknod64)
 AC_CHECK_FUNCS(strtol strtoll strtoul strtoull strtouq __strtoull)
-AC_CHECK_FUNCS(fstat strchr utime utimes chflags)
+AC_CHECK_FUNCS(fstat strchr chflags)
 AC_CHECK_FUNCS(getrlimit fsync fdatasync memset strlcpy strlcat setpgid)
 AC_CHECK_FUNCS(memmove setsid glob strpbrk pipe crypt16 getauthuid)
 AC_CHECK_FUNCS(strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent)