(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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60558 138bc75d-0d04-0410-961f-82ee72b054a4

26 files changed, 92 insertions, 47 deletions

diff --git a/config/ChangeLog b/config/ChangeLog
index c183693fd6b..dd742ba0b72 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -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>
 
 	* mh-cygwin: Don't build libtermcap if it doesn't exist.
diff --git a/config/acx.m4 b/config/acx.m4
new file mode 100644
index 00000000000..36bc9bec93c
--- /dev/null
+++ b/config/acx.m4
@@ -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
+
+
diff --git a/config/mh-a68bsd b/config/mh-a68bsd
deleted file mode 100644
index 2fe28d0a4e2..00000000000
--- a/config/mh-a68bsd
+++ /dev/null
@@ -1,2 +0,0 @@
-RANLIB=true
-BISON=yacc
diff --git a/config/mh-aix386 b/config/mh-aix386
deleted file mode 100644
index 4accd1cddfb..00000000000
--- a/config/mh-aix386
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB = @:
diff --git a/config/mh-apollo68 b/config/mh-apollo68
deleted file mode 100644
index eb102d55010..00000000000
--- a/config/mh-apollo68
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB=true
diff --git a/config/mh-cxux b/config/mh-cxux
index 0a98f113baf..8680654fff8 100644
--- a/config/mh-cxux
+++ b/config/mh-cxux
@@ -1,7 +1,5 @@
 # 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.
 AR_FLAGS = cq
 
diff --git a/config/mh-delta88 b/config/mh-delta88
deleted file mode 100644
index bc9c45302d5..00000000000
--- a/config/mh-delta88
+++ /dev/null
@@ -1,4 +0,0 @@
-RANLIB = true
-
-
-
diff --git a/config/mh-dgux386 b/config/mh-dgux386
index 2fcd4bf09bb..b2d2a057b4c 100644
--- a/config/mh-dgux386
+++ b/config/mh-dgux386
@@ -1,6 +1,3 @@
-# from mh-sysv4
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
diff --git a/config/mh-hp300 b/config/mh-hp300
deleted file mode 100644
index 17a69a6c89f..00000000000
--- a/config/mh-hp300
+++ /dev/null
@@ -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
diff --git a/config/mh-hpux b/config/mh-hpux
deleted file mode 100644
index 40030020773..00000000000
--- a/config/mh-hpux
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB = true
diff --git a/config/mh-hpux8 b/config/mh-hpux8
deleted file mode 100644
index 40030020773..00000000000
--- a/config/mh-hpux8
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB = true
diff --git a/config/mh-interix b/config/mh-interix
index 16930060d70..67dff5c4432 100644
--- a/config/mh-interix
+++ b/config/mh-interix
@@ -1,6 +1,5 @@
 # The shell may not be in /bin. 
 SHELL = sh
-RANLIB = true
 
 # We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
 # built without debugging information
diff --git a/config/mh-irix5 b/config/mh-irix5
deleted file mode 100644
index 0019ee4308e..00000000000
--- a/config/mh-irix5
+++ /dev/null
@@ -1,2 +0,0 @@
-# Makefile changes for SGI's running IRIX-5.x.
-RANLIB = true
diff --git a/config/mh-irix6 b/config/mh-irix6
deleted file mode 100644
index bf6d8dc73d7..00000000000
--- a/config/mh-irix6
+++ /dev/null
@@ -1,2 +0,0 @@
-# Makefile changes for SGI's running IRIX-6.x.
-RANLIB = true
diff --git a/config/mh-lynxrs6k b/config/mh-lynxrs6k
index 3ee763996de..fac1b973a60 100644
--- a/config/mh-lynxrs6k
+++ b/config/mh-lynxrs6k
@@ -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.
 SHELL = /bin/bash
diff --git a/config/mh-ncr3000 b/config/mh-ncr3000
index ead6cce7332..7c6ee12739b 100644
--- a/config/mh-ncr3000
+++ b/config/mh-ncr3000
@@ -1,6 +1,4 @@
 # Host configuration file for an NCR 3000 (i486/SVR4) system.
 
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cq
diff --git a/config/mh-ncrsvr43 b/config/mh-ncrsvr43
deleted file mode 100644
index 5446d77abf9..00000000000
--- a/config/mh-ncrsvr43
+++ /dev/null
@@ -1,3 +0,0 @@
-# Host configuration file for an NCR 3000 (i486/SVR43) system.
-
-RANLIB = true
diff --git a/config/mh-necv4 b/config/mh-necv4
index 6845f3caa20..d71805e052a 100644
--- a/config/mh-necv4
+++ b/config/mh-necv4
@@ -1,6 +1,4 @@
 # Host Makefile fragment for NEC MIPS SVR4.
 
-RANLIB = true
-
 # NEC -lX11 needs some other libraries.
 X11_EXTRA_LIBS = -lsocket -lnsl
diff --git a/config/mh-openedition b/config/mh-openedition
deleted file mode 100644
index 40030020773..00000000000
--- a/config/mh-openedition
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB = true
diff --git a/config/mh-riscos b/config/mh-riscos
deleted file mode 100644
index 07588c76f1f..00000000000
--- a/config/mh-riscos
+++ /dev/null
@@ -1,3 +0,0 @@
-# This is for a MIPS running RISC/os 4.52C.
-
-RANLIB = true
diff --git a/config/mh-sco b/config/mh-sco
index 574b92aa71d..bf5a807b0e7 100644
--- a/config/mh-sco
+++ b/config/mh-sco
@@ -1,4 +1,3 @@
-RANLIB = true
 # You may need this if you don't have bison.
 # BISON = yacc -Sm10400
 
diff --git a/config/mh-solaris b/config/mh-solaris
index 16553c5f3cd..6e8f296a4ea 100644
--- a/config/mh-solaris
+++ b/config/mh-solaris
@@ -1,5 +1,2 @@
 # Makefile changes for Suns running Solaris 2
-
-RANLIB = true
-
 X11_EXTRA_LIBS = -lnsl -lsocket
diff --git a/config/mh-sysv b/config/mh-sysv
deleted file mode 100644
index 40030020773..00000000000
--- a/config/mh-sysv
+++ /dev/null
@@ -1 +0,0 @@
-RANLIB = true
diff --git a/config/mh-sysv4 b/config/mh-sysv4
index 3634950d75c..2e9374c7f96 100644
--- a/config/mh-sysv4
+++ b/config/mh-sysv4
@@ -1,5 +1,3 @@
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
diff --git a/config/mh-sysv5 b/config/mh-sysv5
index 3634950d75c..2e9374c7f96 100644
--- a/config/mh-sysv5
+++ b/config/mh-sysv5
@@ -1,5 +1,3 @@
-RANLIB = true
-
 # The l flag generates a warning from the SVR4 archiver, remove it.
 AR_FLAGS = cr
 
diff --git a/config/mt-v810 b/config/mt-v810
index 97da6c26592..f5714f89e8a 100644
--- a/config/mt-v810
+++ b/config/mt-v810
@@ -1,4 +1,3 @@
 CC_FOR_TARGET = ca732 -ansi
 AS_FOR_TARGET = as732
 AR_FOR_TARGET = ar732
-RANLIB_FOR_TARGET = true