[Emacs-diffs] /srv/bzr/emacs/trunk r112033: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 112033
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-13 06:17:36 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/config.in
  autogen/configure

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2013-03-02 11:17:34 +0000
+++ b/autogen/config.in 2013-03-13 10:17:36 +0000
@@ -218,9 +218,6 @@
 /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */
 #undef HAVE_AIX_SMT_EXP
 
-/* Define to 1 if you have the `alarm' function. */
-#undef HAVE_ALARM
-
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
    may be supplied by this distribution. */
 #undef HAVE_ALLOCA
@@ -281,6 +278,10 @@
 /* Define to 1 if you have the `dbus_watch_get_unix_fd' function. */
 #undef HAVE_DBUS_WATCH_GET_UNIX_FD
 
+/* Define to 1 if you have the declaration of `alarm', and to 0 if you don't.
+   */
+#undef HAVE_DECL_ALARM
+
 /* Define to 1 if you have the declaration of `fdopendir', and to 0 if you
    don't. */
 #undef HAVE_DECL_FDOPENDIR
@@ -329,6 +330,10 @@
    don't. */
 #undef HAVE_DECL_UNSETENV
 
+/* Define to 1 if you have the declaration of `_putenv', and to 0 if you
+   don't. */
+#undef HAVE_DECL__PUTENV
+
 /* Define to 1 if you have the declaration of `__fpending', and to 0 if you
    don't. */
 #undef HAVE_DECL___FPENDING
@@ -1130,9 +1135,6 @@
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
-/* Define to 1 if you have the `_putenv' function. */
-#undef HAVE__PUTENV
-
 /* Define to 1 if _setjmp and _longjmp work. */
 #undef HAVE__SETJMP
 

=== modified file 'autogen/configure'
--- a/autogen/configure 2013-03-08 08:04:30 +0000
+++ b/autogen/configure 2013-03-13 10:17:36 +0000
@@ -3349,7 +3349,6 @@
 as_fn_append ac_header_list " stdint.h"
 as_fn_append ac_header_list " inttypes.h"
 as_fn_append ac_func_list " lstat"
-as_fn_append ac_func_list " alarm"
 as_fn_append ac_header_list " sys/select.h"
 as_fn_append ac_func_list " pselect"
 as_fn_append ac_func_list " pthread_sigmask"
@@ -19467,7 +19466,16 @@
   REPLACE_NANOSLEEP=GNULIB_PORTCHECK;
   REPLACE_TIMEGM=GNULIB_PORTCHECK;
 
+ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" 
"$ac_includes_default"
+if test "x$ac_cv_have_decl_alarm" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ALARM $ac_have_decl
+_ACEOF
 
 
   GNULIB_PSELECT=0;
@@ -22549,8 +22557,8 @@
 # include <unistd.h>
 #endif
 
-#ifndef HAVE_ALARM
-# define alarm(X) /* empty */
+#if HAVE_DECL_ALARM
+# include <signal.h>
 #endif
 
 /* Work around redefinition to rpl_putenv by other config tests.  */
@@ -22686,10 +22694,13 @@
   int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1;
   int time_t_signed = ! ((time_t) 0 < (time_t) -1);
 
+#if HAVE_DECL_ALARM
   /* This test makes some buggy mktime implementations loop.
      Give up after 60 seconds; a mktime slower than that
      isn't worth using anyway.  */
+  signal (SIGALRM, SIG_DFL);
   alarm (60);
+#endif
 
   time_t_max = (! time_t_signed
                 ? (time_t) -1
@@ -23267,17 +23278,17 @@
   gl_LIBOBJS="$gl_LIBOBJS putenv.$ac_objext"
 
 
-  for ac_func in _putenv
-do :
-  ac_fn_c_check_func "$LINENO" "_putenv" "ac_cv_func__putenv"
-if test "x$ac_cv_func__putenv" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__PUTENV 1
+  ac_fn_c_check_decl "$LINENO" "_putenv" "ac_cv_have_decl__putenv" 
"$ac_includes_default"
+if test "x$ac_cv_have_decl__putenv" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL__PUTENV $ac_have_decl
 _ACEOF
 
-fi
-done
-
 
   fi