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
This commit is contained in:
parent
dfe5a36e95
commit
671aa708d9
31 changed files with 4165 additions and 1293 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
2002-12-27 Nathanael Nerode <neroden@gcc.gnu.org>
|
2002-12-27 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||||
|
|
||||||
* configure: Fix stupid bug where RANLIB was mistakenly included.
|
* configure: Fix stupid bug where RANLIB was mistakenly included.
|
||||||
|
|
19
Makefile.in
19
Makefile.in
|
@ -369,6 +369,10 @@ all: all.normal
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
|
|
||||||
#### host and target specific makefile fragments come in here.
|
#### host and target specific makefile fragments come in here.
|
||||||
|
@target_makefile_frag@
|
||||||
|
@alphaieee_frag@
|
||||||
|
@ospace_frag@
|
||||||
|
@host_makefile_frag@
|
||||||
###
|
###
|
||||||
|
|
||||||
# Flags to pass down to all sub-makes.
|
# Flags to pass down to all sub-makes.
|
||||||
|
@ -1086,7 +1090,7 @@ local-clean:
|
||||||
|
|
||||||
local-distclean:
|
local-distclean:
|
||||||
-rm -f Makefile config.status config.cache mh-frag mt-frag
|
-rm -f Makefile config.status config.cache mh-frag mt-frag
|
||||||
-rm -f multilib.out multilib.ts multilib.tmp
|
-rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
|
||||||
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
||||||
rm -rf $(TARGET_SUBDIR); \
|
rm -rf $(TARGET_SUBDIR); \
|
||||||
else true; fi
|
else true; fi
|
||||||
|
@ -7694,14 +7698,13 @@ multilib.ts: maybe-all-gcc
|
||||||
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
|
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
|
||||||
cd $(srcdir) && autogen Makefile.def
|
cd $(srcdir) && autogen Makefile.def
|
||||||
|
|
||||||
# with the gnu make, this is done automatically.
|
# Rebuilding Makefile.
|
||||||
|
Makefile: Makefile.in configure $(gcc_version_trigger)
|
||||||
host_makefile_frag=@host_makefile_frag@
|
$(SHELL) ./config.status --recheck
|
||||||
target_makefile_frag=@target_makefile_frag@
|
|
||||||
|
|
||||||
Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
|
|
||||||
$(SHELL) ./config.status
|
|
||||||
|
|
||||||
|
# Rebuilding configure.
|
||||||
|
configure: configure.in
|
||||||
|
cd $(srcdir) && autoconf
|
||||||
#
|
#
|
||||||
|
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|
19
Makefile.tpl
19
Makefile.tpl
|
@ -372,6 +372,10 @@ all: all.normal
|
||||||
.PHONY: all
|
.PHONY: all
|
||||||
|
|
||||||
#### host and target specific makefile fragments come in here.
|
#### host and target specific makefile fragments come in here.
|
||||||
|
@target_makefile_frag@
|
||||||
|
@alphaieee_frag@
|
||||||
|
@ospace_frag@
|
||||||
|
@host_makefile_frag@
|
||||||
###
|
###
|
||||||
|
|
||||||
# Flags to pass down to all sub-makes.
|
# Flags to pass down to all sub-makes.
|
||||||
|
@ -643,7 +647,7 @@ local-clean:
|
||||||
|
|
||||||
local-distclean:
|
local-distclean:
|
||||||
-rm -f Makefile config.status config.cache mh-frag mt-frag
|
-rm -f Makefile config.status config.cache mh-frag mt-frag
|
||||||
-rm -f multilib.out multilib.ts multilib.tmp
|
-rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
|
||||||
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
||||||
rm -rf $(TARGET_SUBDIR); \
|
rm -rf $(TARGET_SUBDIR); \
|
||||||
else true; fi
|
else true; fi
|
||||||
|
@ -1413,14 +1417,13 @@ multilib.ts: maybe-all-gcc
|
||||||
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
|
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
|
||||||
cd $(srcdir) && autogen Makefile.def
|
cd $(srcdir) && autogen Makefile.def
|
||||||
|
|
||||||
# with the gnu make, this is done automatically.
|
# Rebuilding Makefile.
|
||||||
|
Makefile: Makefile.in configure $(gcc_version_trigger)
|
||||||
host_makefile_frag=@host_makefile_frag@
|
$(SHELL) ./config.status --recheck
|
||||||
target_makefile_frag=@target_makefile_frag@
|
|
||||||
|
|
||||||
Makefile: Makefile.in configure.in $(host_makefile_frag) $(target_makefile_frag) $(gcc_version_trigger)
|
|
||||||
$(SHELL) ./config.status
|
|
||||||
|
|
||||||
|
# Rebuilding configure.
|
||||||
|
configure: configure.in
|
||||||
|
cd $(srcdir) && autoconf
|
||||||
#
|
#
|
||||||
|
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|
|
@ -1,3 +1,12 @@
|
||||||
|
2002-12-28 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
2002-12-16 Christopher Faylor <cgf@redhat.com>
|
2002-12-16 Christopher Faylor <cgf@redhat.com>
|
||||||
|
|
||||||
* mh-cygwin: Don't build libtermcap if it doesn't exist.
|
* mh-cygwin: Don't build libtermcap if it doesn't exist.
|
||||||
|
|
83
config/acx.m4
Normal file
83
config/acx.m4
Normal file
|
@ -0,0 +1,83 @@
|
||||||
|
# Autoconf M4 include file defining utility macros for complex Canadian
|
||||||
|
# cross builds.
|
||||||
|
|
||||||
|
####
|
||||||
|
# _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
|
||||||
|
|
||||||
|
####
|
||||||
|
# NCN_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||||
|
# Like AC_CHECK_TOOL, but tries a prefix of the target, not the host.
|
||||||
|
# Code is pretty much lifted from autoconf2.53.
|
||||||
|
|
||||||
|
AC_DEFUN([NCN_CHECK_TARGET_TOOL],
|
||||||
|
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||||
|
if test -n "$ncn_target_tool_prefix"; then
|
||||||
|
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
|
||||||
|
[${ncn_target_tool_prefix}$2], , [$4])
|
||||||
|
fi
|
||||||
|
if test -z "$ac_cv_prog_$1" ; then
|
||||||
|
ncn_ct_$1=$$1
|
||||||
|
AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4])
|
||||||
|
$1=$ncn_ct_$1
|
||||||
|
else
|
||||||
|
$1="$ac_cv_prog_$1"
|
||||||
|
fi
|
||||||
|
]) []dnl # NCN_CHECK_TARGET_TOOL
|
||||||
|
|
||||||
|
|
||||||
|
####
|
||||||
|
# NCN_STRICT_CHECK_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||||
|
# Like AC_CHECK_TOOL, but requires the prefix if build!=host.
|
||||||
|
|
||||||
|
AC_DEFUN([NCN_STRICT_CHECK_TOOL],
|
||||||
|
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||||
|
if test -n "$ncn_tool_prefix"; then
|
||||||
|
AC_CHECK_PROG([$1], [${ncn_tool_prefix}$2],
|
||||||
|
[${ncn_tool_prefix}$2], , [$4])
|
||||||
|
fi
|
||||||
|
if test -z "$ac_cv_prog_$1" ; then
|
||||||
|
if test $build = $host ; then
|
||||||
|
ncn_ct_$1=$$1
|
||||||
|
AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4])
|
||||||
|
$1=$ncn_ct_$1
|
||||||
|
else
|
||||||
|
$1="$3"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
$1="$ac_cv_prog_$1"
|
||||||
|
fi
|
||||||
|
]) []dnl # NCN_STRICT_CHECK_TOOL
|
||||||
|
|
||||||
|
|
||||||
|
####
|
||||||
|
# NCN_STRICT_CHECK_TARGET_TOOL(variable, prog-to-check-for,[value-if-not-found],[path])
|
||||||
|
# Like NCN_CHECK_TARGET_TOOL, but requires the prefix if build!=target.
|
||||||
|
|
||||||
|
AC_DEFUN([NCN_STRICT_CHECK_TARGET_TOOL],
|
||||||
|
[AC_REQUIRE([_NCN_TOOL_PREFIXES]) []dnl
|
||||||
|
if test -n "$ncn_target_tool_prefix"; then
|
||||||
|
AC_CHECK_PROG([$1], [${ncn_target_tool_prefix}$2],
|
||||||
|
[${ncn_target_tool_prefix}$2], , [$4])
|
||||||
|
fi
|
||||||
|
if test -z "$ac_cv_prog_$1" ; then
|
||||||
|
if test $build = $target ; then
|
||||||
|
ncn_ct_$1=$$1
|
||||||
|
AC_CHECK_PROG([ncn_ct_$1], [$2], [$2], [$3], [$4])
|
||||||
|
$1=$ncn_ct_$1
|
||||||
|
else
|
||||||
|
$1="$3"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
$1="$ac_cv_prog_$1"
|
||||||
|
fi
|
||||||
|
]) []dnl # NCN_STRICT_CHECK_TARGET_TOOL
|
||||||
|
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
RANLIB=true
|
|
||||||
BISON=yacc
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB = @:
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB=true
|
|
|
@ -1,7 +1,5 @@
|
||||||
# Configuration for Harris CX/UX 7 (and maybe 6), based on sysv4 configuration.
|
# Configuration for Harris CX/UX 7 (and maybe 6), based on sysv4 configuration.
|
||||||
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# The l flag generates a warning from the SVR4 archiver, remove it.
|
# The l flag generates a warning from the SVR4 archiver, remove it.
|
||||||
AR_FLAGS = cq
|
AR_FLAGS = cq
|
||||||
|
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
# from mh-sysv4
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# The l flag generates a warning from the SVR4 archiver, remove it.
|
# The l flag generates a warning from the SVR4 archiver, remove it.
|
||||||
AR_FLAGS = cr
|
AR_FLAGS = cr
|
||||||
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
# If "ar" in $PATH is GNU ar, the symbol table may need rebuilding.
|
|
||||||
# If it's HP/UX ar, this should be harmless.
|
|
||||||
RANLIB = ar ts
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB = true
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB = true
|
|
|
@ -1,6 +1,5 @@
|
||||||
# The shell may not be in /bin.
|
# The shell may not be in /bin.
|
||||||
SHELL = sh
|
SHELL = sh
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
|
# We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
|
||||||
# built without debugging information
|
# built without debugging information
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Makefile changes for SGI's running IRIX-5.x.
|
|
||||||
RANLIB = true
|
|
|
@ -1,2 +0,0 @@
|
||||||
# Makefile changes for SGI's running IRIX-6.x.
|
|
||||||
RANLIB = true
|
|
|
@ -1,5 +1,2 @@
|
||||||
# LynxOS running on the rs6000 doesn't have ranlib
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# /bin/sh is too buggy, so use /bin/bash instead.
|
# /bin/sh is too buggy, so use /bin/bash instead.
|
||||||
SHELL = /bin/bash
|
SHELL = /bin/bash
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
# Host configuration file for an NCR 3000 (i486/SVR4) system.
|
# Host configuration file for an NCR 3000 (i486/SVR4) system.
|
||||||
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# The l flag generates a warning from the SVR4 archiver, remove it.
|
# The l flag generates a warning from the SVR4 archiver, remove it.
|
||||||
AR_FLAGS = cq
|
AR_FLAGS = cq
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
# Host configuration file for an NCR 3000 (i486/SVR43) system.
|
|
||||||
|
|
||||||
RANLIB = true
|
|
|
@ -1,6 +1,4 @@
|
||||||
# Host Makefile fragment for NEC MIPS SVR4.
|
# Host Makefile fragment for NEC MIPS SVR4.
|
||||||
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# NEC -lX11 needs some other libraries.
|
# NEC -lX11 needs some other libraries.
|
||||||
X11_EXTRA_LIBS = -lsocket -lnsl
|
X11_EXTRA_LIBS = -lsocket -lnsl
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB = true
|
|
|
@ -1,3 +0,0 @@
|
||||||
# This is for a MIPS running RISC/os 4.52C.
|
|
||||||
|
|
||||||
RANLIB = true
|
|
|
@ -1,4 +1,3 @@
|
||||||
RANLIB = true
|
|
||||||
# You may need this if you don't have bison.
|
# You may need this if you don't have bison.
|
||||||
# BISON = yacc -Sm10400
|
# BISON = yacc -Sm10400
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,2 @@
|
||||||
# Makefile changes for Suns running Solaris 2
|
# Makefile changes for Suns running Solaris 2
|
||||||
|
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
X11_EXTRA_LIBS = -lnsl -lsocket
|
X11_EXTRA_LIBS = -lnsl -lsocket
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
RANLIB = true
|
|
|
@ -1,5 +1,3 @@
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# The l flag generates a warning from the SVR4 archiver, remove it.
|
# The l flag generates a warning from the SVR4 archiver, remove it.
|
||||||
AR_FLAGS = cr
|
AR_FLAGS = cr
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
RANLIB = true
|
|
||||||
|
|
||||||
# The l flag generates a warning from the SVR4 archiver, remove it.
|
# The l flag generates a warning from the SVR4 archiver, remove it.
|
||||||
AR_FLAGS = cr
|
AR_FLAGS = cr
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
CC_FOR_TARGET = ca732 -ansi
|
CC_FOR_TARGET = ca732 -ansi
|
||||||
AS_FOR_TARGET = as732
|
AS_FOR_TARGET = as732
|
||||||
AR_FOR_TARGET = ar732
|
AR_FOR_TARGET = ar732
|
||||||
RANLIB_FOR_TARGET = true
|
|
||||||
|
|
755
configure.in
755
configure.in
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue