[COMMITTED] Let non-add-on preconfigure scripts set libc_config_ok.
diff mbox

Message ID 20150409205935.A50AB2C3BA0@topped-with-meat.com
State New
Headers show

Commit Message

Roland McGrath April 9, 2015, 8:59 p.m. UTC
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.

Patch
diff mbox

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