@@ -1,3 +1,7 @@

+Fri Mar 16 21:56:21 CET 2007 (tk)

+---------------------------------

+  * configure.in: use -lthr instead of -pthread on FreeBSD 6.x

+

 Fri Mar 16 15:47:08 GMT 2007 (njh)

 ----------------------------------

   * clamav-milter:	Better start up of the logg() inferface, now similar

@@ -23085,7 +23085,7 @@ cat >>confdefs.h <<\_ACEOF

 _ACEOF

     ;;

-freebsd*)

+freebsd45*)

     if test "$have_pthreads" = "yes"; then

 	THREAD_LIBS="-pthread -lc_r"

 	TH_SAFE="-thread-safe"

@@ -23114,6 +23114,35 @@ _ACEOF

     use_gethostbyname_r="no"

     ;;

+freebsd6*)

+    if test "$have_pthreads" = "yes"; then

+	THREAD_LIBS="-lthr"

+	TH_SAFE="-thread-safe"

+

+cat >>confdefs.h <<\_ACEOF

+#define CL_THREAD_SAFE 1

+_ACEOF

+

+

+cat >>confdefs.h <<\_ACEOF

+#define _REENTRANT 1

+_ACEOF

+

+	if test "$want_clamuko" = "yes"; then

+

+cat >>confdefs.h <<\_ACEOF

+#define CLAMUKO 1

+_ACEOF

+

+	fi

+    fi

+

+cat >>confdefs.h <<\_ACEOF

+#define C_BSD 1

+_ACEOF

+

+    use_gethostbyname_r="no"

+    ;;

 dragonfly*)

     if test "$have_pthreads" = "yes"; then

 	THREAD_LIBS="-pthread"

@@ -440,7 +440,7 @@ solaris*)

     fi

     AC_DEFINE(C_SOLARIS,1,[os is solaris])

     ;;

-freebsd*)

+freebsd[45]*)

     if test "$have_pthreads" = "yes"; then

 	THREAD_LIBS="-pthread -lc_r"

 	TH_SAFE="-thread-safe"

@@ -450,7 +450,20 @@ freebsd*)

 	    AC_DEFINE(CLAMUKO,1,[enable clamuko])

 	fi

     fi

-    AC_DEFINE(C_BSD,1,[os is freebsd])

+    AC_DEFINE(C_BSD,1,[os is freebsd 4 or 5])

+    use_gethostbyname_r="no"

+    ;;

+freebsd6*)

+    if test "$have_pthreads" = "yes"; then

+	THREAD_LIBS="-lthr"

+	TH_SAFE="-thread-safe"

+	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])

+	AC_DEFINE(_REENTRANT,1,[thread safe])

+	if test "$want_clamuko" = "yes"; then

+	    AC_DEFINE(CLAMUKO,1,[enable clamuko])

+	fi

+    fi

+    AC_DEFINE(C_BSD,1,[os is freebsd 6])

     use_gethostbyname_r="no"

     ;;

 dragonfly*)