--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-04  Bruno Haible  <bruno@clisp.org>
+
+	* lib/sys_time_.h: Rename GETTIMEOFDAY_REPLACEMENT to
+	REPLACE_GETTIMEOFDAY.
+	* modules/sys_time (Makefile.am): Likewise.
+	* m4/sys_time_h.m4: Likewise.
+	* m4/gettimeofday.m4: Likewise.
+
 2007-03-04  Bruno Haible  <bruno@clisp.org>
 
 	* modules/vasnprintf-posix-tests: New file.

--- a/lib/sys_time_.h
+++ b/lib/sys_time_.h
@@ -35,7 +35,7 @@
 };
 #endif
 
-#if @GETTIMEOFDAY_REPLACEMENT@
+#if @REPLACE_GETTIMEOFDAY@
 # undef gettimeofday
 # define gettimeofday rpl_gettimeofday
 int gettimeofday (struct timeval *restrict, void *restrict);

--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -31,7 +31,7 @@
   gl_FUNC_GETTIMEOFDAY_CLOBBER
 
   if test $gl_cv_func_gettimeofday_posix_signature != yes; then
-    GETTIMEOFDAY_REPLACEMENT=1
+    REPLACE_GETTIMEOFDAY=1
     SYS_TIME_H=sys/time.h
     if test $gl_cv_func_gettimeofday_clobber != yes; then
       AC_LIBOBJ(gettimeofday)
@@ -77,7 +77,7 @@
      [gl_cv_func_gettimeofday_clobber=yes])])
 
  if test $gl_cv_func_gettimeofday_clobber = yes; then
-   GETTIMEOFDAY_REPLACEMENT=1
+   REPLACE_GETTIMEOFDAY=1
    SYS_TIME_H=sys/time.h
    gl_GETTIMEOFDAY_REPLACE_LOCALTIME
    AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1,

--- a/m4/sys_time_h.m4
+++ b/m4/sys_time_h.m4
@@ -9,8 +9,8 @@
 
 AC_DEFUN([gl_HEADER_SYS_TIME_H],
 [
-  dnl Use AC_REQUIRE here, so that the GETTIMEOFDAY_REPLACEMENT=0 statement
-  dnl below is expanded once only, before all GETTIMEOFDAY_REPLACEMENT=1
+  dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
+  dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
   dnl statements that occur in other macros.
   AC_REQUIRE([gl_HEADER_SYS_TIME_H_BODY])
 ])
@@ -50,8 +50,8 @@
   AC_SUBST([HAVE_STRUCT_TIMEVAL])
 
   dnl Assume POSIX behavior unless another module says otherwise.
-  GETTIMEOFDAY_REPLACEMENT=0
-  AC_SUBST([GETTIMEOFDAY_REPLACEMENT])
+  REPLACE_GETTIMEOFDAY=0
+  AC_SUBST([REPLACE_GETTIMEOFDAY])
   if test $HAVE_SYS_TIME_H = 0 || test $HAVE_STRUCT_TIMEVAL = 0; then
     SYS_TIME_H=sys/time.h
   else

--- a/modules/sys_time
+++ b/modules/sys_time
@@ -23,7 +23,7 @@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \
 	      -e 's|@''ABSOLUTE_SYS_TIME_H''@|$(ABSOLUTE_SYS_TIME_H)|g' \
-	      -e 's/@''GETTIMEOFDAY_REPLACEMENT''@/$(GETTIMEOFDAY_REPLACEMENT)/g' \
+	      -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \
 	      -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \
 	      < $(srcdir)/sys_time_.h; \
 	} > $@-t