--- configure.orig	Mon Jul  7 00:22:15 2008
+++ configure	Tue Nov 18 21:51:12 2008
@@ -20258,7 +20258,7 @@
 	  THREADS_LDADD="-lpthread"
 	  THREADS_LDFLAGS=""
       ;;
-      freebsd5*)
+      freebsd[45]*)
 ## If I understand how all those threading models works correctly
 ## in FreeBSD I will make an option in configure script
 ## --with-freebsd-threads={c_r,pthreads,linuxthreads,thr}
@@ -20273,7 +20273,7 @@
 
 ##    FreeBSD Standard threads
       	CFLAGS="-pthread -D_THREAD_SAFE  $CFLAGS"
-	THREADS_LDADD="-XCClinker -lc_r"
+	THREADS_LDADD="-lc_r"
 	THREADS_LDFLAGS=""
 ## FreeBSD has pthreads rwlocks from version 3 (I think)
 #	AC_DEFINE(HAVE_PTHREADS_RWLOCK,1,[Define HAVE_PTHREADS_RWLOCK if pthreads library supports rwlocks])
@@ -20284,9 +20284,9 @@
 
       ;;
 
-      freebsd6*)
+      freebsd*)
         CFLAGS="-D_THREAD_SAFE  $CFLAGS"
-        THREADS_LDADD="-XCClinker -lthr"
+        THREADS_LDADD="-lthr"
         THREADS_LDFLAGS=""
       ;;
 
