From patchwork Thu Apr  9 20:59:35 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Roland McGrath <roland@hack.frob.com>
X-Patchwork-Id: 6121
Received: (qmail 30785 invoked by alias); 9 Apr 2015 20:59:40 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 30774 invoked by uid 89); 9 Apr 2015 20:59:40 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL, BAYES_20,
	KAM_LAZY_DOMAIN_SECURITY autolearn=no version=3.3.2
X-HELO: topped-with-meat.com
MIME-Version: 1.0
From: Roland McGrath <roland@hack.frob.com>
To: "GNU C. Library" <libc-alpha@sourceware.org> 
Subject: [COMMITTED PATCH] Let non-add-on preconfigure scripts set
	libc_config_ok.
Message-Id: <20150409205935.A50AB2C3BA0@topped-with-meat.com>
Date: Thu,  9 Apr 2015 13:59:35 -0700 (PDT)
X-CMAE-Score: 0
X-CMAE-Analysis: v=2.1 cv=SvUDtp+0 c=1 sm=1 tr=0
	a=WkljmVdYkabdwxfqvArNOQ==:117 a=14OXPxybAAAA:8 a=kj9zAlcOel0A:10
	a=hOe2yjtxAAAA:8 a=YXC0el5e9Vb3VbSIyiMA:9 a=CjuIK1q_8ugA:10

This lets sysdeps/*/preconfigure in the main tree (not just in add-ons)
set libc_config_ok=yes.  This means e.g. sysdeps/OS/preconfigure can do it
rather than having to touch the glob matches in configure.ac itself.


Thanks,
Roland


	* configure.ac (libc_config_ok): Initialize before reading
	preconfigure scripts, not after.
	* configure: Regenerated.

--- a/configure
+++ b/configure
@@ -3878,6 +3878,10 @@ if test "${with_cpu+set}" = set; then :
 fi
 
 
+# An preconfigure script can set this when it wants to disable the sanity
+# check below.
+libc_config_ok=no
+
 if frags=`ls -d $srcdir/sysdeps/*/preconfigure 2> /dev/null`
 then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysdeps preconfigure fragments" >&5
@@ -3891,9 +3895,6 @@ $as_echo_n "checking for sysdeps preconfigure fragments... " >&6; }
 $as_echo "" >&6; }
 fi
 
-# An add-on can set this when it wants to disable the sanity check below.
-libc_config_ok=no
-
 subdirs="$subdirs "
 
 
--- a/configure.ac
+++ b/configure.ac
@@ -412,12 +412,13 @@ AC_ARG_WITH([cpu],
   esac
 ])
 
+# An preconfigure script can set this when it wants to disable the sanity
+# check below.
+libc_config_ok=no
+
 dnl Let sysdeps/*/preconfigure act here, like they can in add-ons.
 LIBC_PRECONFIGURE([$srcdir], [for sysdeps])
 
-# An add-on can set this when it wants to disable the sanity check below.
-libc_config_ok=no
-
 dnl Having this here, though empty, makes sure that if add-ons' fragments
 dnl do AC_CONFIG_SUBDIRS([some-dir]), which just sets $subdirs, then
 dnl our AC_OUTPUT will actually use it.