--- configure.orig	Wed Jul 16 17:22:00 2008
+++ configure	Fri Sep  5 13:29:30 2008
@@ -63,14 +63,14 @@
     FreeBSD)
 	case $release in
 	    7.0-RELEASE)
-		CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ -D_THREAD_SAFE -DSUNOS -D_FREEBSD7"
-		LIBS="$LIBS -pthread -lcompat -lpthread -L/usr/local/lib -liconv"
+		CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ \${PTHREAD_CFLAGS} -DSUNOS -D_FREEBSD7"
+		LIBS="$LIBS \${PTHREAD_LIBS} -lcompat -lpthread -L/usr/local/lib -liconv"
 		CC="cc"
 		CXX="c++"
 		;;
 	    *)
-		CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ -D_THREAD_SAFE -DSUNOS"
-		LIBS="$LIBS -pthread -lcompat -lc_r -L/usr/local/lib -liconv"
+		CFLAGS="$CFLAGS -I/usr/local/include -I/usr/src/contrib/libstdc++ \${PTHREAD_CFLAGS} -DSUNOS -D_FREEBSD7"
+		LIBS="$LIBS \${PTHREAD_LIBS} -lcompat -lc_r -L/usr/local/lib -liconv"
 		;;
 	esac
 	;;