Changeset: 0d3117e0b5ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d3117e0b5ef
Modified Files:
MonetDB4/configure.ag
pathfinder/configure.ag
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (125 lines):
diff -r 4ba54a6420c1 -r 0d3117e0b5ef MonetDB4/configure.ag
--- a/MonetDB4/configure.ag Tue Nov 16 15:15:34 2010 +0100
+++ b/MonetDB4/configure.ag Tue Nov 16 16:16:10 2010 +0100
@@ -216,7 +216,7 @@
<malloc.h> header file.]),,[ ])
CFLAGS="$CFLAGS_bak"
AC_CHECK_HEADERS(fcntl.h limits.h unistd.h pwd.h dlfcn.h)
-AC_CHECK_HEADERS(time.h sys/time.h utime.h sys/utime.h)
+AC_CHECK_HEADERS(time.h sys/time.h)
AC_CHECK_HEADERS(sys/file.h sys/param.h sys/mman.h)
AC_CHECK_HEADERS(rlimit.h sys/resource.h)
AC_CHECK_HEADERS(string.h strings.h signal.h sys/socket.h sys/un.h termios.h)
@@ -311,7 +311,6 @@
AC_FUNC_SETPGRP()
fi
AC_TYPE_SIGNAL()
-AC_FUNC_UTIME_NULL()
AC_FUNC_VPRINTF()
AC_FUNC_MEMCMP()
AC_CHECK_FUNCS(strsignal)
diff -r 4ba54a6420c1 -r 0d3117e0b5ef buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.c Tue Nov 16 15:15:34 2010 +0100
+++ b/buildtools/Mx/Io.c Tue Nov 16 16:16:10 2010 +0100
@@ -30,7 +30,6 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_UTIME_NULL
#ifdef HAVE_UTIME_H
#include <utime.h>
#else
@@ -38,7 +37,6 @@
#include <sys/utime.h>
#endif
#endif
-#endif
#include "disclaimer.h"
#ifdef NATIVE_WIN32
@@ -326,19 +324,12 @@
case 0: /* identical files, remove temporary file */
printf("%s: %s - not modified \n", mx_file, f->f_name);
if (!notouch) {
-#ifdef HAVE_UTIME_NULL
utime(f->f_name, 0); /* touch the file */
-#else
- goto rename;
-#endif
}
unlink(f->f_tmp);
break;
case 1: /* different file */
printf("%s: %s - modified \n", mx_file, f->f_name);
-#ifndef HAVE_UTIME_NULL
- rename:
-#endif
unlink(f->f_name);
if (rename(f->f_tmp, f->f_name))
perror("rename");
diff -r 4ba54a6420c1 -r 0d3117e0b5ef buildtools/Mx/configure.ac
--- a/buildtools/Mx/configure.ac Tue Nov 16 15:15:34 2010 +0100
+++ b/buildtools/Mx/configure.ac Tue Nov 16 16:16:10 2010 +0100
@@ -33,7 +33,7 @@
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([getopt.h limits.h stddef.h stdlib.h string.h unistd.h
utime.h])
+AC_CHECK_HEADERS([getopt.h limits.h stddef.h stdlib.h string.h sys/utime.h
unistd.h utime.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STAT
@@ -45,7 +45,6 @@
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_FUNC_STAT
-AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([memset mkdir strchr strcspn strrchr strstr utime])
AC_CHECK_DECLS(getopt)
diff -r 4ba54a6420c1 -r 0d3117e0b5ef buildtools/Mx/winconfig.h
--- a/buildtools/Mx/winconfig.h Tue Nov 16 15:15:34 2010 +0100
+++ b/buildtools/Mx/winconfig.h Tue Nov 16 16:16:10 2010 +0100
@@ -103,18 +103,18 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
+/* Define to 1 if you have the <sys/utime.h> header file. */
+#define HAVE_SYS_UTIME_H 1
+
/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
/* Define to 1 if you have the `utime' function. */
-/* #undef HAVE_UTIME */
+#define HAVE_UTIME 1
/* Define to 1 if you have the <utime.h> header file. */
/* #undef HAVE_UTIME_H */
-/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
-/* #undef HAVE_UTIME_NULL */
-
/* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1
diff -r 4ba54a6420c1 -r 0d3117e0b5ef pathfinder/configure.ag
--- a/pathfinder/configure.ag Tue Nov 16 15:15:34 2010 +0100
+++ b/pathfinder/configure.ag Tue Nov 16 16:16:10 2010 +0100
@@ -604,7 +604,7 @@
as arguments for --with-default-backend.])
fi
-AC_CHECK_HEADERS(time.h sys/time.h utime.h sys/utime.h string.h)
+AC_CHECK_HEADERS(time.h sys/time.h string.h)
dnl The xmlshredder requires strdup() & strndup(). We test here if both are
dnl available on the system. If not, we will define them ourselves
@@ -623,7 +623,6 @@
AC_HEADER_TIME()
AC_STRUCT_TM()
AC_STRUCT_TIMEZONE()
-AC_FUNC_UTIME_NULL()
AC_CHECK_FUNCS([ftime ctime_r localtime_r])
ctime_r3=yes
AC_MSG_CHECKING(ctime_r3)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
