This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
Re: [commit/sim] switch autoconf 2.59
- From: Andrew Cagney <cagney at gnu dot org>
- To: Andrew Cagney <cagney at gnu dot org>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Mon, 10 Jan 2005 11:16:46 -0500
- Subject: Re: [commit/sim] switch autoconf 2.59
- References: <41DF55E5.7010307@gnu.org>
Andrew Cagney wrote:
Same as for gdb, built on ppc (native, sim/ppc built) and amd64. This
patch includes some AC_CONFIG_SUBDIRS changes to sim/configure as they
turn out to be incompatible with autoconf 2.13.
A number of factors on friday co conspired to stop me committing the
original patch (network failed, a build barfed, ....).
So attached is what was really committed, I suspect that removing the
AC_AUX_DIRECTORY call avoids the bug that daniel hinted at.
PPC builds fine.
really committed,
Andrew
Index: arm/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Replace configure.in. Requires autoconf 2.59 and
correctly calls AC_CONFIG_SUBDIRS.
* configure: Re-generate.
Index: common/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* aclocal.m4 (SIM_AC_COMMON): Delete call to AC_CONFIG_AUX_DIR.
* configure: Re-generate.
Index: d10v/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: erc32/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: frv/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: h8300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: igen/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m32r/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: m68hc11/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mcore/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mips/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: mn10300/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: ppc/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: sh/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/d10v-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/frv-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/m32r-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/mips64el-elf/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: testsuite/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
Index: v850/ChangeLog
2005-01-07 Andrew Cagney <cagney@gnu.org>
* configure.ac: Rename configure.in, require autoconf 2.59.
* configure: Re-generate.
--- - 2005-01-10 11:07:30.108043000 -0500
+++ arm/configure.ac 2005-01-07 16:58:56.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:32.079357000 -0500
+++ common/configure.ac 2005-01-08 17:59:14.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
# This is intended for use by the target specific directories, and by us.
--- - 2005-01-10 11:07:34.070449000 -0500
+++ configure.ac 2005-01-07 22:41:24.000000000 -0500
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.13)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_CC
@@ -34,160 +34,86 @@
*) AC_MSG_ERROR(bad value ${enableval} given for --enable-sim option) ;;
esac])
-# Assume simulator can be built with cc.
-# If the user passes --enable-sim built it regardless of $(CC).
-only_if_gcc=no
-only_if_enabled=no
-extra_subdirs=common
-
# WHEN ADDING ENTRIES TO THIS MATRIX:
-# Make sure that the left side always has two dashes. Otherwise you
-# can get spurious matches. Even for unambiguous cases, do this as a
-# convention, else the table becomes a real mess to understand and maintain.
-
-case "${target}" in
- arm*-*-* | thumb*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- strongarm*-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- xscale-*-*)
- sim_target=arm
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- d10v-*-*) sim_target=d10v ;;
-# OBSOLETE d30v-*-*)
-# OBSOLETE sim_target=d30v
-# OBSOLETE only_if_gcc=yes
-# OBSOLETE extra_subdirs="${extra_subdirs} igen"
-# OBSOLETE ;;
-# OBSOLETE fr30-*-*) sim_target=fr30 ;;
- frv-*-*) sim_target=frv
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8300*-*-*)
- sim_target=h8300
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- h8500-*-*) sim_target=h8500 ;;
- i960-*-*) sim_target=i960 ;;
- m32r-*-*) sim_target=m32r ;;
- m68hc11-*-*|m6811-*-*) sim_target=m68hc11 ;;
- mcore-*-*) sim_target=mcore ;;
- mips*-*-*)
- # The MIPS simulator can only be compiled by gcc.
- sim_target=mips
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen testsuite"
- ;;
- mn10300*-*-*)
- # The mn10300 simulator can only be compiled by gcc.
- sim_target=mn10300
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- mn10200*-*-*)
- sim_target=mn10200
- ;;
- sh*-*-*)
- sim_target=sh
- extra_subdirs="${extra_subdirs} testsuite"
- ;;
- powerpc*-*-eabi* | powerpc*-*-solaris* | powerpc*-*-sysv4* | \
- powerpc*-*-elf* | powerpc*-*-linux* | powerpc*-*-netbsd* )
- # The PowerPC simulator uses the GCC extension long long as well as
- # ANSI prototypes, so don't enable it for random host compilers
- # unless asked to.
- sim_target=ppc
- only_if_gcc=yes
- #extra_subdirs="${extra_subdirs}"
- ;;
- tic80-*-*)
- sim_target=tic80
- only_if_gcc=yes
- extra_subdirs="${extra_subdirs} igen"
- ;;
- v850-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850e-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- v850ea-*-*)
- # The V850 simulator can only be compiled by gcc.
- sim_target=v850
- extra_subdirs="${extra_subdirs} igen"
- only_if_gcc=yes
- ;;
- w65-*-*)
- sim_target=w65
- # The w65 is suffering from gradual decay.
- only_if_enabled=yes
- ;;
- z8k*-*-*) sim_target=z8k ;;
- sparc64-*-*)
- only_if_gcc=yes
- sim_target=none # Don't build erc32 if sparc64.
- ;;
- sparclite*-*-* | sparc86x*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- sim_target=erc32
- ;;
- sparc*-*-*)
- # The SPARC simulator can only be compiled by gcc.
- only_if_gcc=yes
- # Unfortunately erc32 won't build on many hosts, so only enable
- # it if the user really really wants it.
- only_if_enabled=yes
- sim_target=erc32
- ;;
- *) sim_target=none ;;
-esac
-
-
-# Is there a testsuite directory for the target?
-testdir=`echo ${target} | sed -e 's/-.*-/-/'`
-if test -r ${srcdir}/testsuite/${testdir}/configure ; then
- extra_subdirs="${extra_subdirs} testsuite"
-fi
-
-case "${enable_sim}" in
-no) sim_target=none ;;
-yes)
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- echo "Can't enable simulator since not compiling with GCC."
- sim_target=none
- fi
- fi
- ;;
-*)
- if test ${only_if_enabled} = yes ; then
- sim_target=none
- else
- if test ${only_if_gcc} = yes ; then
- if test "${GCC}" != yes ; then
- sim_target=none
- fi
- fi
- fi
- ;;
-esac
-
-if test x"${sim_target}" != xnone ; then
- configdirs="${extra_subdirs} ${sim_target}"
- AC_CONFIG_SUBDIRS($configdirs)
+# Make sure that the left side always has two dashes. Otherwise you
+# can get spurious matches. Even for unambiguous cases, do this as a
+# convention, else the table becomes a real mess to understand and
+# maintain.
+
+if test "${enable_sim}" != no; then
+ testsuite=no
+ common=no
+ igen=no
+ case "${target}" in
+ arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+ AC_CONFIG_SUBDIRS(arm)
+ testsuite=yes
+ common=yes
+ ;;
+ d10v-*-*)
+ AC_CONFIG_SUBDIRS(d10v)
+ ;;
+ frv-*-*)
+ AC_CONFIG_SUBDIRS(frv)
+ testsuite=yes
+ common=yes
+ ;;
+ h8300*-*-*)
+ AC_CONFIG_SUBDIRS(h8300)
+ testsuite=yes
+ common=yes
+ ;;
+ m32r-*-*)
+ AC_CONFIG_SUBDIRS(m32r)
+ testsuite=yes
+ common=yes
+ ;;
+ m68hc11-*-*|m6811-*-*)
+ AC_CONFIG_SUBDIRS(m68hc11)
+ testsuite=yes
+ common=yes
+ ;;
+ mcore-*-*)
+ AC_CONFIG_SUBDIRS(mcore)
+ testsuite=yes
+ common=yes
+ ;;
+ mips*-*-*)
+ AC_CONFIG_SUBDIRS(mips)
+ testsuite=yes
+ igen=yes
+ ;;
+ mn10300*-*-*)
+ AC_CONFIG_SUBDIRS(mn10300)
+ igen=yes
+ ;;
+ sh*-*-*)
+ AC_CONFIG_SUBDIRS(sh)
+ testsuite=yes
+ common=yes
+ ;;
+ powerpc*-*-* )
+ AC_CONFIG_SUBDIRS(ppc)
+ common=yes
+ ;;
+ v850*-*-* )
+ AC_CONFIG_SUBDIRS(v850)
+ common=yes
+ ;;
+ sparc*-*-*)
+ AC_CONFIG_SUBDIRS(erc32)
+ ;;
+ esac
+ if test "$testsuite" = yes; then
+ AC_CONFIG_SUBDIRS(testsuite)
+ fi
+ if test "$common" = yes; then
+ AC_CONFIG_SUBDIRS(common)
+ fi
+ if test "$igen" = yes; then
+ AC_CONFIG_SUBDIRS(igen)
+ fi
fi
AC_OUTPUT(Makefile)
--- - 2005-01-10 11:07:36.307450000 -0500
+++ d10v/configure.ac 2005-01-07 16:59:54.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:38.488149000 -0500
+++ erc32/configure.ac 2005-01-07 17:00:10.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:40.494109000 -0500
+++ frv/configure.ac 2005-01-07 17:00:27.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:42.774681000 -0500
+++ h8300/configure.ac 2005-01-07 17:00:53.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:44.734280000 -0500
+++ igen/configure.ac 2005-01-07 17:01:07.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(table.h)
AC_PROG_INSTALL
--- - 2005-01-10 11:07:47.246876000 -0500
+++ m32r/configure.ac 2005-01-07 17:01:24.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:50.061360000 -0500
+++ m68hc11/configure.ac 2005-01-07 17:01:44.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:52.310655000 -0500
+++ mcore/configure.ac 2005-01-07 17:02:12.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:54.430105000 -0500
+++ mips/configure.ac 2005-01-07 17:02:33.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:56.961787000 -0500
+++ mn10300/configure.ac 2005-01-07 17:02:51.000000000 -0500
@@ -1,7 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-dnl 2.12 botches SHELL substitution
-AC_PREREQ(2.12.1)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:07:59.143421000 -0500
+++ ppc/configure.ac 2005-01-07 17:03:06.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
AC_PROG_INSTALL
--- - 2005-01-10 11:08:01.671499000 -0500
+++ sh/configure.ac 2005-01-07 17:03:20.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON
--- - 2005-01-10 11:08:03.617111000 -0500
+++ testsuite/d10v-elf/configure.ac 2005-01-07 17:03:43.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:05.764901000 -0500
+++ testsuite/frv-elf/configure.ac 2005-01-07 17:04:31.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:07.733352000 -0500
+++ testsuite/m32r-elf/configure.ac 2005-01-07 17:04:46.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:10.475154000 -0500
+++ testsuite/mips64el-elf/configure.ac 2005-01-07 17:05:12.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
dnl FIXME - think of a truly uniq file to this directory
AC_INIT(Makefile.in)
--- - 2005-01-10 11:08:12.532004000 -0500
+++ testsuite/configure.ac 2005-01-07 20:29:09.000000000 -0500
@@ -4,7 +4,7 @@
dnl script appropriate for this directory. For more information, check
dnl any existing configure script.
-AC_PREREQ(2.5)
+AC_PREREQ(2.59)
AC_INIT(common/bits-tst.c)
CC=${CC-cc}
--- - 2005-01-10 11:08:14.648668000 -0500
+++ v850/configure.ac 2005-01-07 17:05:38.000000000 -0500
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
sinclude(../common/aclocal.m4)
-AC_PREREQ(2.5)dnl
+AC_PREREQ(2.59)dnl
AC_INIT(Makefile.in)
SIM_AC_COMMON