From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 594 invoked by alias); 25 Nov 2004 20:54:06 -0000 Mailing-List: contact binutils-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sources.redhat.com Received: (qmail 359 invoked from network); 25 Nov 2004 20:53:55 -0000 Received: from unknown (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org with SMTP; 25 Nov 2004 20:53:55 -0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id iAPKrni0031454; Thu, 25 Nov 2004 15:53:54 -0500 Received: from localhost (mail@vpn50-45.rdu.redhat.com [172.16.50.45]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id iAPKrmr11210; Thu, 25 Nov 2004 15:53:48 -0500 Received: from rsandifo by localhost with local (Exim 3.35 #1) id 1CXQcd-00078K-00; Thu, 25 Nov 2004 20:53:47 +0000 To: gcc-patches@gcc.gnu.org Cc: java-patches@gcc.gnu.org, libstdc++@gcc.gnu.org, binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: Add config/gxx-include-dir.m4 (patch 3/4 for PR 7305) References: <87is7tejx4.fsf@redhat.com> From: Richard Sandiford Date: Thu, 25 Nov 2004 20:54:00 -0000 In-Reply-To: <87is7tejx4.fsf@redhat.com> (Richard Sandiford's message of "Thu, 25 Nov 2004 20:46:31 +0000") Message-ID: <87act5ejl0.fsf@redhat.com> User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2004-11/txt/msg00344.txt.bz2 Following up from: http://gcc.gnu.org/ml/gcc-patches/2004-11/msg02185. this patch adds a new config/gxx-include-dir.m4 autoconf fragment and uses it in the top-level configure script. Bootstrapped & regression tested on i686-pc-linux-gnu in combination with patches 1 and 2. I also checked the same things as before. OK to install? Richard * configure.in: Include config/gxx-include-dir.m4. Use TL_AC_GXX_INCLUDE_DIR. Remove some now-redundant AC_SUBSTs. * configure: Regenerate. config/ * gxx-include-dir.m4: New file. --- configure.in.2 Thu Nov 25 15:36:35 2004 +++ configure.in Thu Nov 25 17:02:39 2004 @@ -20,6 +20,7 @@ sinclude(config/acx.m4) sinclude(config/gcc-version.m4) +sinclude(config/gxx-include-dir.m4) AC_INIT(move-if-change) AC_PREREQ(2.13) @@ -1961,22 +1962,7 @@ fi target_configargs="--cache-file=./config.cache --host=${target_alias} --build=${build_alias} ${target_configargs}" # provide a proper gxx_include_dir. -# Note, if you change the default, make sure to fix both here and in -# the gcc and libstdc++-v3 subdirectories. -# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. -case "${with_gxx_include_dir}" in - yes) - AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory]) - ;; - no | "") - case "${enable_version_specific_runtime_libs}" in - yes) gxx_include_dir='${libsubdir}/include/c++' ;; - *) - libstdcxx_incdir=c++/${gcc_version} - gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; - esac ;; - *) gxx_include_dir=${with_gxx_include_dir} ;; -esac +TL_AC_GXX_INCLUDE_DIR FLAGS_FOR_TARGET= case " $target_configdirs " in @@ -2154,8 +2140,6 @@ AC_SUBST(gcc_version) AC_SUBST(tooldir) AC_SUBST(build_tooldir) AC_SUBST(GDB_TK) -AC_SUBST(gxx_include_dir) -AC_SUBST(libstdcxx_incdir) # Build module lists & subconfigure args. AC_SUBST(build_configargs) diff -u /dev/null config/gxx-include-dir.m4 --- /dev/null Fri Apr 23 00:21:55 2004 +++ config/gxx-include-dir.m4 Thu Nov 25 17:02:22 2004 @@ -0,0 +1,26 @@ +dnl Usage: TL_AC_GXX_INCLUDE_DIR +dnl +dnl Set $gxx_include_dir to the location of the installed C++ include +dnl directory. The value depends on $gcc_version and the configuration +dnl options --with-gxx-include-dir and --enable-version-specific-runtime-libs. +dnl +dnl If you change the default here, you'll need to change the gcc and +dnl libstdc++-v3 subdirectories too. +AC_DEFUN([TL_AC_GXX_INCLUDE_DIR], +[ +case "${with_gxx_include_dir}" in + yes) + AC_MSG_ERROR([--with-gxx-include-dir=[[dir]] requires a directory]) + ;; + no | "") + case "${enable_version_specific_runtime_libs}" in + yes) gxx_include_dir='${libsubdir}/include/c++' ;; + *) + libstdcxx_incdir=c++/${gcc_version} + gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;; + esac ;; + *) gxx_include_dir=${with_gxx_include_dir} ;; +esac +AC_SUBST(gxx_include_dir) +AC_SUBST(libstdcxx_incdir) +])