This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Let non-add-on preconfigure scripts set libc_config_ok.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Thu, 9 Apr 2015 13:59:35 -0700 (PDT)
- Subject: [COMMITTED PATCH] Let non-add-on preconfigure scripts set libc_config_ok.
- Authentication-results: sourceware.org; auth=none
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.