From f58279208ccf163a946265073435210835a725b0 Mon Sep 17 00:00:00 2001
From: ljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 4 Oct 2004 22:26:16 +0000
Subject: [PATCH] 	* configure.ac (*-*-freebsd[[1234]]*): Refine error
 message 	emission rule. 	* configure: Rebuilt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88533 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog    | 6 ++++++
 libjava/configure    | 2 +-
 libjava/configure.ac | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 983682fcf868..f8350e6333e8 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-04  Loren J. Rittle  <ljrittle@acm.org>
+
+	* configure.ac (*-*-freebsd[[1234]]*): Refine error message
+	emission rule.
+	* configure: Rebuilt.
+
 2004-09-30  Tom Tromey  <tromey@redhat.com>
 
 	* java/text/MessageFormat.java (Field): Constructor now
diff --git a/libjava/configure b/libjava/configure
index e0a8bfd63286..050c5281a71c 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -8332,7 +8332,7 @@ case "$THREADS" in
 	# the command line.  For now, the user must provide the -pthread
 	# switch to link code compiled with gcj.  In future, consider adding
 	# support for weak references to pthread_* functions ala gthr.h API.
-	THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
+	THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
 	;;
      *-*-freebsd*)
 	# FreeBSD 5 implements a model much closer to other modern UNIX
diff --git a/libjava/configure.ac b/libjava/configure.ac
index fdc38d573f9d..c0282afda5ba 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -652,7 +652,7 @@ case "$THREADS" in
 	# the command line.  For now, the user must provide the -pthread
 	# switch to link code compiled with gcj.  In future, consider adding
 	# support for weak references to pthread_* functions ala gthr.h API.
-	THREADSPEC='%{!pthread: %eUnder this configuration, the user must provide -pthread when linking.}'
+	THREADSPEC='%{!pthread: %{!shared: %eUnder this configuration, the user must provide -pthread when linking.}}'
 	;;
      *-*-freebsd*)
 	# FreeBSD 5 implements a model much closer to other modern UNIX
-- 
GitLab