Bump to autoconf 2.69 and automake 1.15.1

[deliverable/binutils-gdb.git] / sim / rx / configure.ac

diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index 19657c588fa3cc55630d9b235a712d173580fbaf..a5859db18f2a83d48b4c13d717410cec7d167788 100644 (file)
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -1,7 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2005, 2007, 2008, 2009, 2010, 2011
-dnl Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2018 Free Software Foundation, Inc.
 dnl Contributed by Red Hat, Inc.
 dnl 
 dnl This file is part of the GNU simulators.
@@ -19,23 +18,24 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 dnl
-AC_PREREQ(2.64)dnl
 AC_INIT(Makefile.in)
-sinclude(../common/aclocal.m4)
+sinclude(../common/acinclude.m4)
 
 SIM_AC_COMMON
 
 AC_CHECK_HEADERS(getopt.h)
 
 AC_ARG_ENABLE(cycle-accurate,
-[  --disable-cycle-accurate ],
+[AS_HELP_STRING([--disable-cycle-accurate],
+               [Disable cycle accurate simulation (faster runtime)])],
 [case "${enableval}" in
 yes | no) ;;
 *)     AC_MSG_ERROR(bad value ${enableval} given for --enable-cycle-accurate option) ;;
 esac])
 
 AC_ARG_ENABLE(cycle-stats,
-[  --disable-cycle-stats ],
+[AS_HELP_STRING([--disable-cycle-stats],
+               [Disable cycle statistics (faster runtime)])],
 [case "${enableval}" in
 yes | no) ;;
 *)     AC_MSG_ERROR(bad value ${enableval} given for --enable-cycle-stats option) ;;
@@ -45,14 +45,14 @@ echo enable_cycle_accurate is $enable_cycle_accurate
 echo enable_cycle_stats is $enable_cycle_stats
 
 if test "x${enable_cycle_accurate}" != xno; then
-AC_DEFINE([CYCLE_ACCURATE])
+  AC_DEFINE([CYCLE_ACCURATE], 1, [--enable-cycle-accurate])
 
   if test "x${enable_cycle_stats}" != xno; then
-  AC_DEFINE([CYCLE_STATS])
+    AC_DEFINE([CYCLE_STATS], 1, [--enable-cycle-stats])
   fi
 else
   if test "x${enable_cycle_stats}" != xno; then
-  AC_ERROR([cycle-stats not available without cycle-accurate])
+    AC_ERROR([cycle-stats not available without cycle-accurate])
   fi
 fi