summaryrefslogtreecommitdiff
path: root/gcc/configure.ac
diff options
context:
space:
mode:
authorRichard Sandiford <rsandifo@redhat.com>2004-12-03 10:40:18 +0000
committerRichard Sandiford <rsandifo@gcc.gnu.org>2004-12-03 10:40:18 +0000
commit4982adbebc69cedb3b6df18631ce1f1004e3e114 (patch)
tree68aa74ace108d73eedf10a7a9157e955ae39b486 /gcc/configure.ac
parentad1063d5454b3d745bea35909dc677344250d827 (diff)
downloadgcc-4982adbebc69cedb3b6df18631ce1f1004e3e114.tar.gz
config.if: Delete.
* config.if: Delete. * configure.in: Set libstdcxx_incdir directly. * configure: Regenerate. From-SVN: r91679
Diffstat (limited to 'gcc/configure.ac')
-rw-r--r--gcc/configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 795145cbd96..b261551045c 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -100,6 +100,8 @@ AC_MSG_ERROR([
*** and run configure again.])
fi
+TL_AC_GCC_VERSION([$srcdir/..])
+
# -----------
# Directories
# -----------
@@ -137,7 +139,7 @@ if test x${gcc_gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then
gcc_gxx_include_dir='${libsubdir}/include/c++'
else
- topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+ libstdcxx_incdir=c++/${gcc_version}
changequote(<<, >>)dnl
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
changequote([, ])dnl
@@ -1379,8 +1381,6 @@ xm_file="ansidecl.h ${xm_file}"
# UNSORTED
# --------
-TL_AC_GCC_VERSION([$srcdir/..])
-
changequote(,)dnl
# Compile in configure arguments.
if test -f configargs.h ; then