aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xconfigure15
-rw-r--r--configure.in15
-rw-r--r--linuxthreads/ChangeLog6
4 files changed, 38 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b86a8d2e9..f9e8f7e02e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-08-26 Roland McGrath <roland@redhat.com>
+
+ * configure.in (add_ons_automatic): New variable, set to yes or no
+ indicating --enable-add-ons with no explicit list.
+ (running add-on fragments): Allow a fragment to modify $libc_add_on
+ and have that affect its place in the list of add-ons to use.
+ * configure: Regenerated.
+
2004-08-26 Ulrich Drepper <drepper@redhat.com>
* nscd/cache.c: Major rewrite. The data is now optionally kept in
diff --git a/configure b/configure
index e3eda44575..0624aa7013 100755
--- a/configure
+++ b/configure
@@ -1593,11 +1593,13 @@ if test "${enable_add_ons+set}" = set; then
enableval="$enable_add_ons"
case "$enableval" in
yes) add_ons=`cd $srcdir && echo */configure | sed -e 's!/configure!!g'`
+ add_ons_automatic=yes
test "$add_ons" = "*" && add_ons= ;;
- *) add_ons=`echo "$enableval" | sed 's/,/ /g'`;;
+ *) add_ons=`echo "$enableval" | sed 's/,/ /g'`
+ add_ons_automatic=no ;;
esac
else
- add_ons=
+ add_ons= add_ons_automatic=no
fi;
@@ -1859,7 +1861,11 @@ echo "$as_me: error: add-on directory \"$f\" does not exist" >&2;}
done
# Now source each add-on's configure fragment.
- # The fragments can use $srcdir/$libc_add_on to find themselves.
+ # The fragments can use $srcdir/$libc_add_on to find themselves,
+ # and test $add_ons_automatic to see if they were explicitly requested.
+ # A fragment can clear (or even change) $libc_add_on to affect
+ # whether it goes into the list to be actually used in the build.
+ use_add_ons=
for libc_add_on in $add_ons; do
libc_add_on_frag=$srcdir/$libc_add_on/configure
if test -r $libc_add_on_frag; then
@@ -1870,7 +1876,10 @@ echo "${ECHO_T}running configure fragment for add-on $libc_add_on" >&6
{ echo "$as_me:$LINENO: WARNING: add-on fragment $libc_add_on_frag missing" >&5
echo "$as_me: WARNING: add-on fragment $libc_add_on_frag missing" >&2;}
fi
+ use_add_ons="$use_add_ons $libc_add_on"
done
+ # Use echo to strip excess whitespace.
+ add_ons="`echo $use_add_ons`"
fi
diff --git a/configure.in b/configure.in
index e6976ce7f5..e8f2926382 100644
--- a/configure.in
+++ b/configure.in
@@ -175,10 +175,12 @@ AC_ARG_ENABLE([add-ons],
[configure and build add-ons in DIR1,DIR2,... search for add-ons if no parameter given]),
[case "$enableval" in
yes) add_ons=`cd $srcdir && echo */configure | sed -e 's!/configure!!g'`
+ add_ons_automatic=yes
test "$add_ons" = "*" && add_ons= ;;
- *) add_ons=`echo "$enableval" | sed 's/,/ /g'`;;
+ *) add_ons=`echo "$enableval" | sed 's/,/ /g'`
+ add_ons_automatic=no ;;
esac],
- [add_ons=])
+ [add_ons= add_ons_automatic=no])
dnl Let the user avoid using TLS. Don't know why but...
dnl XXX For now we disable support by default.
@@ -363,7 +365,11 @@ if test x"$add_ons" != x; then
done
# Now source each add-on's configure fragment.
- # The fragments can use $srcdir/$libc_add_on to find themselves.
+ # The fragments can use $srcdir/$libc_add_on to find themselves,
+ # and test $add_ons_automatic to see if they were explicitly requested.
+ # A fragment can clear (or even change) $libc_add_on to affect
+ # whether it goes into the list to be actually used in the build.
+ use_add_ons=
for libc_add_on in $add_ons; do
libc_add_on_frag=$srcdir/$libc_add_on/configure
if test -r $libc_add_on_frag; then
@@ -372,7 +378,10 @@ if test x"$add_ons" != x; then
else
AC_MSG_WARN(add-on fragment $libc_add_on_frag missing)
fi
+ use_add_ons="$use_add_ons $libc_add_on"
done
+ # Use echo to strip excess whitespace.
+ add_ons="`echo $use_add_ons`"
fi
AC_SUBST(add_ons)
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 69dbacf4d2..2932af739b 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-26 Roland McGrath <roland@redhat.com>
+
+ * configure.in: New file. If nptl add-on is also selected, barf if
+ explicit and elide ourselves if implicit.
+ * configure: Now generated.
+
2004-08-25 Richard Sandiford <rsandifo@redhat.com>
* sysdeps/unix/sysv/linux/mips/sysdep-cancel.h (CENABLE, CDISABLE,