configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
# Autoconf M4 include file defining utility macros for complex Canadian
|
|
|
|
# cross builds.
|
|
|
|
|
2003-05-18 17:43:44 +02:00
|
|
|
dnl ####
|
|
|
|
dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
|
|
|
|
dnl # $build_alias or canonical $build if blank.
|
|
|
|
dnl # Used when we would use $build_alias, but empty is not OK.
|
|
|
|
AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_BUILD],
|
|
|
|
[AC_REQUIRE([AC_CANONICAL_BUILD]) []dnl
|
|
|
|
case ${build_alias} in
|
|
|
|
"") build_noncanonical=${build} ;;
|
|
|
|
*) build_noncanonical=${build_alias} ;;
|
|
|
|
esac
|
|
|
|
]) []dnl # _GCC_TOPLEV_NONCANONICAL_BUILD
|
|
|
|
|
|
|
|
dnl ####
|
|
|
|
dnl # _GCC_TOPLEV_NONCANONICAL_HOST
|
|
|
|
dnl # $host_alias, or $build_noncanonical if blank.
|
|
|
|
dnl # Used when we would use $host_alias, but empty is not OK.
|
|
|
|
AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_HOST],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
|
|
|
|
case ${host_alias} in
|
|
|
|
"") host_noncanonical=${build_noncanonical} ;;
|
|
|
|
*) host_noncanonical=${host_alias} ;;
|
|
|
|
esac
|
|
|
|
]) []dnl # _GCC_TOPLEV_NONCANONICAL_HOST
|
|
|
|
|
|
|
|
dnl ####
|
|
|
|
dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
|
|
|
|
dnl # $target_alias or $host_noncanonical if blank.
|
|
|
|
dnl # Used when we would use $target_alias, but empty is not OK.
|
|
|
|
AC_DEFUN([_GCC_TOPLEV_NONCANONICAL_TARGET],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
|
|
|
|
case ${target_alias} in
|
|
|
|
"") target_noncanonical=${host_noncanonical} ;;
|
|
|
|
*) target_noncanonical=${target_alias} ;;
|
|
|
|
esac
|
|
|
|
]) []dnl # _GCC_TOPLEV_NONCANONICAL_TARGET
|
|
|
|
|
2004-08-14 00:31:45 +02:00
|
|
|
dnl ####
|
|
|
|
dnl # ACX_NONCANONICAL_BUILD
|
|
|
|
dnl # Like underscored version, but AC_SUBST's.
|
|
|
|
AC_DEFUN([ACX_NONCANONICAL_BUILD],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
|
|
|
|
AC_SUBST(build_noncanonical)
|
|
|
|
]) []dnl # ACX_NONCANONICAL_BUILD
|
|
|
|
|
|
|
|
dnl ####
|
|
|
|
dnl # ACX_NONCANONICAL_HOST
|
|
|
|
dnl # Like underscored version, but AC_SUBST's.
|
|
|
|
AC_DEFUN([ACX_NONCANONICAL_HOST],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_HOST]) []dnl
|
|
|
|
AC_SUBST(host_noncanonical)
|
|
|
|
]) []dnl # ACX_NONCANONICAL_HOST
|
|
|
|
|
|
|
|
dnl ####
|
|
|
|
dnl # ACX_NONCANONICAL_TARGET
|
|
|
|
dnl # Like underscored version, but AC_SUBST's.
|
|
|
|
AC_DEFUN([ACX_NONCANONICAL_TARGET],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
|
|
|
|
AC_SUBST(target_noncanonical)
|
|
|
|
]) []dnl # ACX_NONCANONICAL_TARGET
|
|
|
|
|
2003-05-18 17:43:44 +02:00
|
|
|
dnl ####
|
|
|
|
dnl # GCC_TOPLEV_SUBDIRS
|
|
|
|
dnl # GCC & friends build 'build', 'host', and 'target' tools. These must
|
|
|
|
dnl # be separated into three well-known subdirectories of the build directory:
|
|
|
|
dnl # build_subdir, host_subdir, and target_subdir. The values are determined
|
|
|
|
dnl # here so that they can (theoretically) be changed in the future. They
|
|
|
|
dnl # were previously reproduced across many different files.
|
|
|
|
dnl #
|
|
|
|
dnl # This logic really amounts to very little with autoconf 2.13; it will
|
|
|
|
dnl # amount to a lot more with autoconf 2.5x.
|
|
|
|
AC_DEFUN([GCC_TOPLEV_SUBDIRS],
|
|
|
|
[AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_TARGET]) []dnl
|
|
|
|
AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl
|
|
|
|
# Prefix 'build-' so this never conflicts with target_subdir.
|
|
|
|
build_subdir="build-${build_noncanonical}"
|
re PR bootstrap/17383 (Building in src dir fails)
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.def (target_modules): Remove "stage", now unnecessary.
* Makefile.tpl (HOST_SUBDIR): New substitution.
(STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET,
USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET,
USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET,
USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it.
(Host modules, Bootstrapped modules): Use it.
(Build modules, Target modules): Do not create symlink trees,
always configure out-of-srcdir.
(distclean): Try removing $(host_subdir) with rm before using rm -rf.
* configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET,
GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use
$(HOST_SUBDIR). Create a symlink for host_subdir.
* Makefile.in: Regenerate.
* configure: Regenerate.
config:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* config/acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
gcc build is going.
gcc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* gcc/Makefile.in (host_subdir): New.
(build_objdir): New. Replace ../$(build_subdir) with it throughout.
* gcc/configure: Regenerate.
libada:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition.
libjava:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(COMPPATH): Removed.
(ZIP, GCJH): Replace it with ../$(host_subdir).
(built_gcc_dir): Add $(host_subdir).
* configure: Regenerate.
* Makefile.in, include/Makefile.in, testsuite/Makefile.in,
gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in,
external/w3c_dom/Makefile.in: Regenerate.
libobjc:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383
* configure.ac: Call GCC_TOPLEV_SUBDIRS.
(Determine CFLAGS for gthread): Use $host_subdir.
* configure: Regenerate.
* Makefile.in (host_subdir): New.
(INCLUDES): Use it.
From-SVN: r95680
2005-02-28 14:26:36 +01:00
|
|
|
# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories
|
|
|
|
if ( test $srcdir = . && test -d gcc ) \
|
|
|
|
|| test -d $srcdir/../host-${host_noncanonical}; then
|
|
|
|
host_subdir="host-${host_noncanonical}"
|
|
|
|
else
|
|
|
|
host_subdir=.
|
|
|
|
fi
|
2003-05-18 17:43:44 +02:00
|
|
|
# No prefix.
|
|
|
|
target_subdir=${target_noncanonical}
|
|
|
|
AC_SUBST([build_subdir]) []dnl
|
|
|
|
AC_SUBST([host_subdir]) []dnl
|
|
|
|
AC_SUBST([target_subdir]) []dnl
|
|
|
|
]) []dnl # GCC_TOPLEV_SUBDIRS
|
|
|
|
|
|
|
|
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
####
|
|
|
|
# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM
|
|
|
|
# or AC_INIT.
|
|
|
|
# These demand that AC_CANONICAL_SYSTEM be called beforehand.
|
|
|
|
AC_DEFUN([_NCN_TOOL_PREFIXES],
|
|
|
|
[ncn_tool_prefix=
|
|
|
|
test -n "$host_alias" && ncn_tool_prefix=$host_alias-
|
|
|
|
ncn_target_tool_prefix=
|
|
|
|
test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
|
|
|
|
]) []dnl # _NCN_TOOL_PREFIXES
|
|
|
|
|
|
|
|
####
|
2005-08-12 16:18:46 +02:00
|
|
|
# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
|
|
|
|
# Like plain AC_CHECK_TOOLS, but require prefix if build!=target.
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
|
2005-08-12 16:18:46 +02:00
|
|
|
AC_DEFUN([NCN_STRICT_CHECK_TOOLS],
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
2005-08-12 16:18:46 +02:00
|
|
|
for ncn_progname in $2; do
|
|
|
|
if test -n "$ncn_tool_prefix"; then
|
|
|
|
AC_CHECK_PROG([$1], [${ncn_tool_prefix}${ncn_progname}],
|
|
|
|
[${ncn_tool_prefix}${ncn_progname}], , [$4])
|
|
|
|
fi
|
|
|
|
if test -z "$ac_cv_prog_$1" && test $build = $host ; then
|
|
|
|
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
|
|
|
fi
|
|
|
|
test -n "$ac_cv_prog_$1" && break
|
|
|
|
done
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
|
|
|
|
if test -z "$ac_cv_prog_$1" ; then
|
2005-08-12 16:18:46 +02:00
|
|
|
ifelse([$3],[], [set dummy $2
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
if test $build = $host ; then
|
2005-08-12 16:18:46 +02:00
|
|
|
$1="[$]2"
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
else
|
2005-08-12 16:18:46 +02:00
|
|
|
$1="${ncn_tool_prefix}[$]2"
|
|
|
|
fi], [$1="$3"])
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
fi
|
2005-08-12 16:18:46 +02:00
|
|
|
]) []dnl # NCN_STRICT_CHECK_TOOLS
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
|
|
|
|
####
|
2005-08-12 16:18:46 +02:00
|
|
|
# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path])
|
|
|
|
# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target.
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
|
2005-08-12 16:18:46 +02:00
|
|
|
AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOLS],
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
2005-08-12 16:18:46 +02:00
|
|
|
for ncn_progname in $2; do
|
|
|
|
if test -n "$ncn_target_tool_prefix"; then
|
|
|
|
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}${ncn_progname}],
|
|
|
|
[${ncn_target_tool_prefix}${ncn_progname}], , [$4])
|
|
|
|
fi
|
|
|
|
if test -z "$ac_cv_prog_$1" && test $build = $target ; then
|
|
|
|
AC_CHECK_PROG([$1], [${ncn_progname}], [${ncn_progname}], , [$4])
|
|
|
|
fi
|
|
|
|
test -n "$ac_cv_prog_$1" && break
|
|
|
|
done
|
|
|
|
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
if test -z "$ac_cv_prog_$1" ; then
|
2005-08-12 16:18:46 +02:00
|
|
|
ifelse([$3],[], [set dummy $2
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
if test $build = $target ; then
|
2005-08-12 16:18:46 +02:00
|
|
|
$1="[$]2"
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
else
|
2005-08-12 16:18:46 +02:00
|
|
|
$1="${ncn_target_tool_prefix}[$]2"
|
|
|
|
fi], [$1="$3"])
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
fi
|
2005-08-12 16:18:46 +02:00
|
|
|
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOLS
|
2003-09-25 16:27:52 +02:00
|
|
|
|
|
|
|
###
|
|
|
|
# AC_PROG_CPP_WERROR
|
|
|
|
# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which
|
|
|
|
# triggers warnings from the preprocessor. Will be in autoconf 2.58.
|
|
|
|
# For now, using this also overrides header checks to use only the
|
|
|
|
# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a
|
|
|
|
# bit harder from here).
|
|
|
|
# Eventually autoconf will default to checking headers with the compiler
|
|
|
|
# instead, and we'll have to do this differently.
|
|
|
|
|
|
|
|
AC_DEFUN([AC_PROG_CPP_WERROR],
|
|
|
|
[AC_REQUIRE([AC_PROG_CPP])dnl
|
|
|
|
m4_define([AC_CHECK_HEADER],m4_defn([_AC_CHECK_HEADER_OLD]))
|
|
|
|
ac_c_preproc_warn_flag=yes])# AC_PROG_CPP_WERROR
|
2004-03-11 06:01:17 +01:00
|
|
|
|
|
|
|
# Test for GNAT.
|
|
|
|
# We require the gnatbind program, and a compiler driver that
|
|
|
|
# understands Ada. We use the user's CC setting, already found.
|
|
|
|
#
|
|
|
|
# Sets the shell variable have_gnat to yes or no as appropriate, and
|
|
|
|
# substitutes GNATBIND.
|
|
|
|
AC_DEFUN([ACX_PROG_GNAT],
|
|
|
|
[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])
|
|
|
|
AC_REQUIRE([AC_PROG_CC])
|
|
|
|
AC_CHECK_TOOL(GNATBIND, gnatbind, no)
|
|
|
|
AC_CACHE_CHECK([whether compiler driver understands Ada],
|
|
|
|
acx_cv_cc_gcc_supports_ada,
|
|
|
|
[cat >conftest.adb <<EOF
|
|
|
|
procedure conftest is begin null; end conftest;
|
|
|
|
EOF
|
|
|
|
acx_cv_cc_gcc_supports_ada=no
|
|
|
|
# There is a bug in old released versions of GCC which causes the
|
|
|
|
# driver to exit successfully when the appropriate language module
|
|
|
|
# has not been installed. This is fixed in 2.95.4, 3.0.2, and 3.1.
|
|
|
|
# Therefore we must check for the error message as well as an
|
|
|
|
# unsuccessful exit.
|
2004-04-17 00:21:22 +02:00
|
|
|
# Other compilers, like HP Tru64 UNIX cc, exit successfully when
|
|
|
|
# given a .adb file, but produce no object file. So we must check
|
|
|
|
# if an object file was really produced to guard against this.
|
2004-03-11 06:01:17 +01:00
|
|
|
errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
|
2004-04-17 00:21:22 +02:00
|
|
|
if test x"$errors" = x && test -f conftest.$ac_objext; then
|
2004-03-11 06:01:17 +01:00
|
|
|
acx_cv_cc_gcc_supports_ada=yes
|
|
|
|
fi
|
|
|
|
rm -f conftest.*])
|
|
|
|
|
2004-04-17 00:21:22 +02:00
|
|
|
if test x$GNATBIND != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
|
2004-03-11 06:01:17 +01:00
|
|
|
have_gnat=yes
|
|
|
|
else
|
|
|
|
have_gnat=no
|
|
|
|
fi
|
|
|
|
])
|
2004-04-29 09:40:05 +02:00
|
|
|
|
|
|
|
dnl 'make compare' can be significantly faster, if cmp itself can
|
|
|
|
dnl skip bytes instead of using tail. The test being performed is
|
|
|
|
dnl "if cmp --ignore-initial=2 t1 t2 && ! cmp --ignore-initial=1 t1 t2"
|
|
|
|
dnl but we need to sink errors and handle broken shells. We also test
|
|
|
|
dnl for the parameter format "cmp file1 file2 skip1 skip2" which is
|
|
|
|
dnl accepted by cmp on some systems.
|
|
|
|
AC_DEFUN([ACX_PROG_CMP_IGNORE_INITIAL],
|
|
|
|
[AC_CACHE_CHECK([how to compare bootstrapped objects], gcc_cv_prog_cmp_skip,
|
|
|
|
[ echo abfoo >t1
|
|
|
|
echo cdfoo >t2
|
|
|
|
gcc_cv_prog_cmp_skip='tail +16c $$f1 > tmp-foo1; tail +16c $$f2 > tmp-foo2; cmp tmp-foo1 tmp-foo2'
|
|
|
|
if cmp t1 t2 2 2 > /dev/null 2>&1; then
|
|
|
|
if cmp t1 t2 1 1 > /dev/null 2>&1; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
gcc_cv_prog_cmp_skip='cmp $$f1 $$f2 16 16'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
|
|
|
|
if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
|
|
|
|
:
|
|
|
|
else
|
|
|
|
gcc_cv_prog_cmp_skip='cmp --ignore-initial=16 $$f1 $$f2'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
rm t1 t2
|
|
|
|
])
|
|
|
|
do_compare="$gcc_cv_prog_cmp_skip"
|
|
|
|
AC_SUBST(do_compare)
|
|
|
|
])
|
2004-05-24 12:50:45 +02:00
|
|
|
|
|
|
|
dnl See whether we can include both string.h and strings.h.
|
|
|
|
AC_DEFUN([ACX_HEADER_STRING],
|
|
|
|
[AC_CACHE_CHECK([whether string.h and strings.h may both be included],
|
|
|
|
gcc_cv_header_string,
|
|
|
|
[AC_TRY_COMPILE([#include <string.h>
|
|
|
|
#include <strings.h>], , gcc_cv_header_string=yes, gcc_cv_header_string=no)])
|
|
|
|
if test $gcc_cv_header_string = yes; then
|
|
|
|
AC_DEFINE(STRING_WITH_STRINGS, 1, [Define if you can safely include both <string.h> and <strings.h>.])
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
dnl See if stdbool.h properly defines bool and true/false.
|
|
|
|
dnl Check whether _Bool is built-in.
|
|
|
|
AC_DEFUN([ACX_HEADER_STDBOOL],
|
|
|
|
[AC_CACHE_CHECK([for working stdbool.h],
|
|
|
|
ac_cv_header_stdbool_h,
|
|
|
|
[AC_TRY_COMPILE([#include <stdbool.h>],
|
|
|
|
[bool foo = false;],
|
|
|
|
ac_cv_header_stdbool_h=yes, ac_cv_header_stdbool_h=no)])
|
|
|
|
if test $ac_cv_header_stdbool_h = yes; then
|
|
|
|
AC_DEFINE(HAVE_STDBOOL_H, 1,
|
|
|
|
[Define if you have a working <stdbool.h> header file.])
|
|
|
|
fi
|
|
|
|
AC_CACHE_CHECK(for built-in _Bool, gcc_cv_c__bool,
|
|
|
|
[AC_TRY_COMPILE(,
|
|
|
|
[_Bool foo;],
|
|
|
|
gcc_cv_c__bool=yes, gcc_cv_c__bool=no)
|
|
|
|
])
|
|
|
|
if test $gcc_cv_c__bool = yes; then
|
|
|
|
AC_DEFINE(HAVE__BOOL, 1, [Define if the \`_Bool' type is built-in.])
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2004-06-09 10:17:32 +02:00
|
|
|
dnl See if hard links work and if not, try to substitute $1 or simple copy.
|
|
|
|
AC_DEFUN([ACX_PROG_LN],
|
|
|
|
[AC_MSG_CHECKING(whether ln works)
|
|
|
|
AC_CACHE_VAL(acx_cv_prog_LN,
|
|
|
|
[rm -f conftestdata_t
|
|
|
|
echo >conftestdata_f
|
|
|
|
if ln conftestdata_f conftestdata_t 2>/dev/null
|
|
|
|
then
|
|
|
|
acx_cv_prog_LN=ln
|
|
|
|
else
|
|
|
|
acx_cv_prog_LN=no
|
|
|
|
fi
|
|
|
|
rm -f conftestdata_f conftestdata_t
|
|
|
|
])dnl
|
|
|
|
if test $acx_cv_prog_LN = no; then
|
|
|
|
LN="ifelse([$1],,cp,[$1])"
|
|
|
|
AC_MSG_RESULT([no, using $LN])
|
|
|
|
else
|
|
|
|
LN="$acx_cv_prog_LN"
|
|
|
|
AC_MSG_RESULT(yes)
|
|
|
|
fi
|
|
|
|
AC_SUBST(LN)dnl
|
|
|
|
])
|
|
|
|
|
configure.in (CONFIGURED_BISON, [...]): Remove "CONFIGURED_" from the AC_CHECK_PROGS invocation.
toplevel:
2005-12-05 Paolo Bonzini <bonzini@gnu.org>
* configure.in (CONFIGURED_BISON, CONFIGURED_YACC, CONFIGURED_M4,
CONFIGURED_FLEX, CONFIGURED_LEX, CONFIGURED_MAKEINFO): Remove
"CONFIGURED_" from the AC_CHECK_PROGS invocation. Move below.
Find in-tree tools if available.
(EXPECT, RUNTEST, LIPO, STRIP): Find them and substitute them.
(CONFIGURED_*_FOR_TARGET): Don't set nor substitute.
(*_FOR_TARGET): Set them with GCC_TARGET_TOOL.
(COMPILER_*_FOR_TARGET): New.
* Makefile.tpl (HOST_EXPORTS): Add *_FOR_TARGET symbols that gcc needs.
(BASE_TARGET_EXPORTS): Use COMPILER_*_FOR_TARGET symbols.
(CONFIGURED_*, USUAL_*): Remove.
(BISON, YACC, FLEX, LEX, M4, MAKEINFO, EXPECT, RUNTEST, LIPO,
STRIP): Use autoconf substitutions.
(COMPILER_AS_FOR_TARGET, COMPILER_LD_FOR_TARGET,
COMPILER_NM_FOR_TARGET): New.
(EXTRA_HOST_FLAGS): Pass LIPO and STRIP.
(all): Make all-host and all-target in parallel.
(do-[+make_target+], do-check, install, [+compare-target+]): Ensure
that $$r and $$s are set before invoking a recursive make.
(stage[+id+]-bubble): Likewise, and invoke the comparison at the end.
([+bootstrap-target+]): Inline most of the `all' target.
config:
2005-12-05 Paolo Bonzini <bonzini@gnu.org>
* acx.m4 (GCC_TARGET_TOOL): New.
From-SVN: r108059
2005-12-05 16:00:27 +01:00
|
|
|
dnl GCC_TARGET_TOOL(PROGRAM, TARGET-VAR, HOST-VAR, IN-TREE-TOOL, LANGUAGE)
|
|
|
|
AC_DEFUN([GCC_TARGET_TOOL],
|
|
|
|
[AC_MSG_CHECKING(where to find the target $1)
|
|
|
|
if test "x${build}" != "x${host}" ; then
|
|
|
|
# Canadian cross, just use what we found
|
|
|
|
AC_MSG_RESULT(pre-installed)
|
|
|
|
else
|
|
|
|
ifelse([$4],,,
|
|
|
|
[ok=yes
|
|
|
|
case " ${configdirs} " in
|
|
|
|
*" patsubst([$4], [/.*], []) "*) ;;
|
|
|
|
*) ok=no ;;
|
|
|
|
esac
|
|
|
|
ifelse([$5],,,
|
|
|
|
[case ,${enable_languages}, in
|
|
|
|
*,$5,*) ;;
|
|
|
|
*) ok=no ;;
|
|
|
|
esac])
|
|
|
|
if test $ok = yes; then
|
|
|
|
# An in-tree tool is available and we can use it
|
|
|
|
$2='$$r/$(HOST_SUBDIR)/$4'
|
|
|
|
AC_MSG_RESULT(just compiled)
|
|
|
|
el])if test "x$target" = "x$host"; then
|
|
|
|
# We can use an host tool
|
|
|
|
$2='$($3)'
|
|
|
|
AC_MSG_RESULT(host tool)
|
|
|
|
else
|
|
|
|
# We need a cross tool
|
|
|
|
AC_MSG_RESULT(pre-installed)
|
|
|
|
fi
|
|
|
|
fi])
|