Remove config.if.

10 files changed, 30 insertions, 51 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f2b54a..88b61ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* config.if: Delete.
+	* configure.in: Set libstdcxx_incdir directly.
+	* configure: Regenerate.
+	* MAINTAINERS: Remove mention of config.if.
+	* src-release (DEVO_SUPPORT): Remove config.if.
+
 2004-12-02  Eric Christopher  <echristo@redhat.com>
 
 	* Makefile.tpl (clean-target-libgcc): Add stmp-dirs to list
diff --git a/MAINTAINERS b/MAINTAINERS
index 8c9696b..ef4a825 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -96,7 +96,7 @@ winsup/
 	See also winsup/MAINTAINERS.
 
 config-ml.in; setup.com; missing; makefile.vms; utils/; config/;
-config.if; makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
+makefile.vms; missing; ylwrap; mkdep; etc/; install-sh; intl/
 	Ask DJ Delorie <dj@redhat.com> after reading the libiberty entry.
 
 modules file
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d193140..d7f22f8 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* MAINTAINERS: Remove mention of config.if.
+
 2004-11-30  Tero Niemela  <tero_niemela@yahoo.com>
 
 	* Makefile.am: Change LOCALEDIR to $(datadir)/share.
diff --git a/binutils/MAINTAINERS b/binutils/MAINTAINERS
index 85ed704..2f023b6 100644
--- a/binutils/MAINTAINERS
+++ b/binutils/MAINTAINERS
@@ -22,8 +22,8 @@ top level config.guess and config.sub scripts should be sent to:
   config-patches@gnu.org
 
 and not to the binutils lists.  Patches to the other top level
-configure files (configure, configure.in, config-if, config-ml.in)
-should be sent to the binutils lists, and copied to the gcc and gdb
+configure files (configure, configure.in, config-ml.in) should
+be sent to the binutils lists, and copied to the gcc and gdb
 lists as well (gcc-patches@gcc.gnu.org and
 gdb-patches@sources.redhat.com).
 
diff --git a/config.if b/config.if
deleted file mode 100644
index 2655bc3..0000000
--- a/config.if
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /dev/null
-# Don't call it directly. This shell script fragment is called to
-# determine:
-#
-#	1. libstcxx_incdir: the interface name for libstdc++.
-#
-
-# Get the top level src dir.
-if [ -z "${topsrcdir}" -a -z "${top_srcdir}" ]
-then
-  echo "Undefined top level src dir: topsrcdir and top_srcdir are empty" >&2
-  exit 1
-fi
-
-if [ -n "${topsrcdir}" ]
-then
-  if_topsrcdir=${topsrcdir}
-else
-  if_topsrcdir=${top_srcdir}
-fi
-
-# Set libstdcxx_incdir.
-# This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4. 
-if test -z "$gcc_version"; then
-  if test -z "${gcc_version_trigger}" \
-     && test -f ${if_topsrcdir}/gcc/version.c; then
-    gcc_version_trigger=${if_topsrcdir}/gcc/version.c
-  fi    
-  if test -f "${gcc_version_trigger}"; then
-    gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'`
-  else
-    gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'`
-  fi
-  gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
-fi
-libstdcxx_incdir=c++/${gcc_version}
-
diff --git a/configure b/configure
index 4821059..65b13b8 100755
--- a/configure
+++ b/configure
@@ -3387,7 +3387,7 @@ case "${with_gxx_include_dir}" in
     case "${enable_version_specific_runtime_libs}" in
       yes) gxx_include_dir='${libsubdir}/include/c++' ;;
       *)
-        . ${srcdir}/config.if
+	libstdcxx_incdir=c++/${gcc_version}
         gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
     esac ;;
   *) gxx_include_dir=${with_gxx_include_dir} ;;
diff --git a/configure.in b/configure.in
index 993a7b8..587bf92 100644
--- a/configure.in
+++ b/configure.in
@@ -1974,7 +1974,7 @@ case "${with_gxx_include_dir}" in
     case "${enable_version_specific_runtime_libs}" in
       yes) gxx_include_dir='${libsubdir}/include/c++' ;;
       *)
-        . ${srcdir}/config.if
+	libstdcxx_incdir=c++/${gcc_version}
         gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
     esac ;;
   *) gxx_include_dir=${with_gxx_include_dir} ;;
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ad51437..63dcbd5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-03  Richard Sandiford  <rsandifo@redhat.com>
+
+	* README: Remove config.if from directory listing.
+
 2004-12-01  Joel Brobecker  <brobecker@gnat.com>
 
 	* alpha-tdep.c (alpha_register_name): Add comment.
diff --git a/gdb/README b/gdb/README
index c30975d..801d027 100644
--- a/gdb/README
+++ b/gdb/README
@@ -32,14 +32,14 @@ order.
    When you unpack the gdb-6.3.tar.gz file, you'll find a directory
 called `gdb-6.3', which contains:
 
-  COPYING       config-ml.in  gdb          ltcf-gcj.sh     readline
-  COPYING.LIB   config.guess  gettext.m4   ltconfig        sim
-  Makefile.def  config.if     include      ltmain.sh       src-release
-  Makefile.in   config.sub    install-sh   md5.sum         symlink-tree
-  Makefile.tpl  configure     libiberty    missing         texinfo
-  README        configure.in  libtool.m4   mkinstalldirs   ylwrap
-  bfd           djunpack.bat  ltcf-c.sh    move-if-change
-  config        etc           ltcf-cxx.sh  opcodes
+  COPYING       config-ml.in  gettext.m4   ltconfig        sim
+  COPYING.LIB   config.guess  include      ltmain.sh       src-release
+  Makefile.def  config.sub    install-sh   md5.sum         symlink-tree
+  Makefile.in   configure     libiberty    missing         texinfo
+  Makefile.tpl  configure.in  libtool.m4   mkinstalldirs   ylwrap
+  README        djunpack.bat  ltcf-c.sh    move-if-change
+  bfd           etc           ltcf-cxx.sh  opcodes
+  config        gdb           ltcf-gcj.sh  readline
 
 You can build GDB right in the source directory:
 
diff --git a/src-release b/src-release
index c6e43af..9837ba3 100644
--- a/src-release
+++ b/src-release
@@ -44,7 +44,7 @@ PWD = $${PWDCMD-pwd}
 # ChangeLog omitted because it may refer to files which are not in this
 # distribution (perhaps it would be better to include it anyway).
 DEVO_SUPPORT= README Makefile.in configure configure.in \
-	config.guess config.if config.sub config move-if-change \
+	config.guess config.sub config move-if-change \
 	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
 	mkinstalldirs ltconfig ltmain.sh missing ylwrap \
 	libtool.m4 gettext.m4 ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh \