diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index ab77dd46a4c5172fe25aefe6c5795ed75ecd9c95..afbaed422e4230b734e9ee682cc85dea9b2af358 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-22 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ PR target/18444
+ * configure.ac (threading): Accept 'posix95'.
+ * configure: Regenerate.
+
2004-11-04 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.am: Define ACLOCAL_AMFLAGS.
@@ -7,7 +13,6 @@
* Makefile.in, include/Makefile.in: Regenerate.
* configure: Regenerate.
-
2004-10-19 Ulrich Weigand <uweigand@de.ibm.com>
* include/private/gc_priv.h (GC_generic_malloc_words_small_inner):
diff --git a/boehm-gc/configure b/boehm-gc/configure
index b3ef2e7ea6a1de7376e190a91ac49a2e4ff88fb7..ebf3bdd2f1a782ac471b405e0b011a3f11aea573 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -5306,7 +5306,7 @@ case "$THREADS" in
no | none | single)
THREADS=none
;;
- posix | pthreads)
+ posix | posix95 | pthreads)
THREADS=posix
THREADLIBS=-lpthread
case "$host" in
diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac
index 59a3612220267d1483195e8e92f472a9b7c4796b..53a71a394e6c59ad3e9bc0b0542d70a28d9f14eb 100644
--- a/boehm-gc/configure.ac
+++ b/boehm-gc/configure.ac
@@ -120,7 +120,7 @@ case "$THREADS" in
no | none | single)
THREADS=none
;;
- posix | pthreads)
+ posix | posix95 | pthreads)
THREADS=posix
THREADLIBS=-lpthread
case "$host" in
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ef3e20a0cea7170c8302d8f7f4dfbc091045334f..ac468f6e4b0b8fb3afbdf256bda593c8ab566804 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-22 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ PR target/18444
+ * configure.ac (threading): Accept 'posix95'.
+ * configure: Regenerate.
+
2004-11-22 Michael Koch <konqueror@gmx.de>
* gnu/java/nio/SocketChannelImpl.java
diff --git a/libjava/configure b/libjava/configure
index e44e0787ac1193d11ab4c7c501c292a124fbc42c..98261d8278249bd3ff42fa510c44b78dfaf05f8b 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -8298,7 +8298,7 @@ case "$THREADS" in
no | none | single)
THREADS=none
;;
- posix | pthreads)
+ posix | posix95 | pthreads)
THREADS=posix
case "$host" in
*-*-linux*)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index b54b3d2e944c3b23818634ead8e4de1782f857f6..269b64a3e6c7a36cf763588519bed486667f6849 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -617,7 +617,7 @@ case "$THREADS" in
no | none | single)
THREADS=none
;;
- posix | pthreads)
+ posix | posix95 | pthreads)
THREADS=posix
case "$host" in
*-*-linux*)