[SCM] GNU Autoconf source repository branch, master, updated. v2.65-28-g957768d

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Autoconf source repository".

http://git.sv.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=957768d52d14b28a5ee533ae99b538060ed95768

The branch, master has been updated
       via  957768d52d14b28a5ee533ae99b538060ed95768 (commit)
       via  9795fe906ca09a525ea4094ac17b8c16a4d73fb5 (commit)
      from  d99296e4261bbfc566069dcf95f02d0fa70be72c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 957768d52d14b28a5ee533ae99b538060ed95768
Author: Ralf Wildenhues <address@hidden>
Date:   Tue Jan 12 19:43:04 2010 +0100

    Allow AC_FUNC_MKTIME to work with C++.
    
    * lib/autoconf/functions.m4 (AC_FUNC_MKTIME): ANSIfy KnR function
    definitions.  Use `const char*' for character literals; cast them
    to `char*' for putenv.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

commit 9795fe906ca09a525ea4094ac17b8c16a4d73fb5
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jan 11 21:39:21 2010 +0100

    Export AUTOM4TE in tests/atlocal.in, for aclocal.
    
    * tests/atlocal.in: Set and export $AUTOM4TE, for aclocal.
    Report by Tim Rice.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                 |   13 +++++++++++++
 lib/autoconf/functions.m4 |   19 ++++++++-----------
 tests/atlocal.in          |    5 +++++
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83583bc..2ca9eab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-12  Ralf Wildenhues  <address@hidden>
+
+       Allow AC_FUNC_MKTIME to work with C++.
+       * lib/autoconf/functions.m4 (AC_FUNC_MKTIME): ANSIfy KnR function
+       definitions.  Use `const char*' for character literals; cast them
+       to `char*' for putenv.
+
+2010-01-11  Ralf Wildenhues  <address@hidden>
+
+       Export AUTOM4TE in tests/atlocal.in, for aclocal.
+       * tests/atlocal.in: Set and export $AUTOM4TE, for aclocal.
+       Report by Tim Rice.
+
 2010-01-08  Eric Blake  <address@hidden>
 
        Make autotest example act better with automake.
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index 9d51088..24dcf86 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -1004,8 +1004,8 @@ static time_t time_t_max;
 static time_t time_t_min;
 
 /* Values we'll use to set the TZ environment variable.  */
-static char *tz_strings[] = {
-  (char *) 0, "TZ=GMT0", "TZ=JST-9",
+static const char *tz_strings[] = {
+  (const char *) 0, "TZ=GMT0", "TZ=JST-9",
   "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00"
 };
 #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0]))
@@ -1022,7 +1022,7 @@ spring_forward_gap ()
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
 
   tm.tm_year = 98;
   tm.tm_mon = 3;
@@ -1035,16 +1035,14 @@ spring_forward_gap ()
 }
 
 static int
-mktime_test1 (now)
-     time_t now;
+mktime_test1 (time_t now)
 {
   struct tm *lt;
   return ! (lt = localtime (&now)) || mktime (lt) == now;
 }
 
 static int
-mktime_test (now)
-     time_t now;
+mktime_test (time_t now)
 {
   return (mktime_test1 (now)
          && mktime_test1 ((time_t) (time_t_max - now))
@@ -1068,8 +1066,7 @@ irix_6_4_bug ()
 }
 
 static int
-bigtime_test (j)
-     int j;
+bigtime_test (int j)
 {
   struct tm tm;
   time_t now;
@@ -1113,7 +1110,7 @@ year_2050_test ()
      instead of "TZ=America/Vancouver" in order to detect the bug even
      on systems that don't support the Olson extension, or don't have the
      full zoneinfo tables installed.  */
-  putenv ("TZ=PST8PDT,M4.1.0,M10.5.0");
+  putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0");
 
   t = mktime (&tm);
 
@@ -1148,7 +1145,7 @@ main ()
   for (i = 0; i < N_STRINGS; i++)
     {
       if (tz_strings[i])
-       putenv (tz_strings[i]);
+       putenv ((char*) tz_strings[i]);
 
       for (t = 0; t <= time_t_max - delta; t += delta)
        if (! mktime_test (t))
diff --git a/tests/atlocal.in b/tests/atlocal.in
index ae61fd5..cfd527a 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -41,3 +41,8 @@ if test "$ac_cv_dir_trailing_space" = yes; then
 else
   func_sanitize_dir_name () { echo "$@" | sed 's/  *$//'; }
 fi
+
+# AUTOM4TE might be set in the environment.  Override it here so that
+# direct aclocal invocations also use it.
+AUTOM4TE=autom4te
+export AUTOM4TE


hooks/post-receive
-- 
GNU Autoconf source repository