lalr1.cc: check (and fix) %initial-action exception safety

[bison.git] / m4 / timevar.m4

diff --git a/m4/timevar.m4 b/m4/timevar.m4
index ae755a50bbead32d597f6ad7ce24b562dbbab168..f8d36061ba616fc639354c4e642d728d486fa221 100644 (file)
--- a/m4/timevar.m4
+++ b/m4/timevar.m4
@@ -1,11 +1,11 @@
-# -*-Autoconf-*-
-# Checks required to run `timevar', a nonportable memory/time tracker.
+# -*- Autoconf -*-
+# Checks required to run `timevar', a time tracker.

 #
 #

-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2009-2012 Free Software Foundation, Inc.

 #
 #

-# This program is free software; you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify

 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or

 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,


@@ -14,15 +14,21 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 

-# serial 1
+# serial 2

 
 AC_DEFUN([BISON_PREREQ_TIMEVAR],
 
 AC_DEFUN([BISON_PREREQ_TIMEVAR],

-[AC_CHECK_HEADERS([sys/resource.h sys/time.h sys/times.h])
-
+[AC_CHECK_HEADERS([sys/time.h sys/times.h])
+ AC_CHECK_HEADERS([sys/resource.h],,,
+   [$ac_includes_default
+#if HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_TIMES_H
+# include <sys/times.h>
+#endif
+])

 AC_CHECK_FUNCS([times])
 
 AC_CHECK_DECLS([getrusage, times, clock, sysconf], [], [],
 AC_CHECK_FUNCS([times])
 
 AC_CHECK_DECLS([getrusage, times, clock, sysconf], [], [],