aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-04-09 13:55:11 -0700
committerRoland McGrath <roland@hack.frob.com>2015-04-09 13:55:11 -0700
commit054392910be496adb8c4e611084827082135c404 (patch)
treecbfb9aeb3a3532ded50c7037e6bcc60be18270f2
parentb0b88abc1c138923bd1638560c73a3ced227f1d1 (diff)
downloadglibc-054392910be496adb8c4e611084827082135c404.zip
glibc-054392910be496adb8c4e611084827082135c404.tar.gz
glibc-054392910be496adb8c4e611084827082135c404.tar.bz2
Let non-add-on preconfigure scripts set libc_config_ok.
-rw-r--r--ChangeLog4
-rwxr-xr-xconfigure7
-rw-r--r--configure.ac7
3 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 03fbb7e..193ea30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-04-09 Roland McGrath <roland@hack.frob.com>
+ * configure.ac (libc_config_ok): Initialize before reading
+ preconfigure scripts, not after.
+ * configure: Regenerated.
+
* test-skeleton.c (TIMEOUT): Move #define to top level.
(main): Grok environment variable TEST_DIRECT. If set, print
test expectation details into that file and then behave as if
diff --git a/configure b/configure
index 79864b7..97e549e 100755
--- 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 "
diff --git a/configure.ac b/configure.ac
index 39f3e86..def655a 100644
--- 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.