Browse code

use -pthread also for FreeBSD 6.x

git-svn: trunk@2855

Tomasz Kojm authored on 2007/02/24 07:37:55
Showing 3 changed files
... ...
@@ -1,3 +1,7 @@
1
+Fri Feb 23 21:42:08 CET 2007 (tk)
2
+---------------------------------
3
+  * configure: use -pthread also for FreeBSD 6.x
4
+
1 5
 Fri Feb 23 20:22:20 GMT 2007 (njh)
2 6
 ----------------------------------
3 7
  * libclamav/untar.c:	Added extra functionality (bug 269) - based on
... ...
@@ -23080,38 +23080,9 @@ cat >>confdefs.h <<\_ACEOF
23080 23080
 _ACEOF
23081 23081
 
23082 23082
     ;;
23083
-freebsd45*)
23084
-    if test "$have_pthreads" = "yes"; then
23085
-	THREAD_LIBS="-pthread -lc_r"
23086
-	TH_SAFE="-thread-safe"
23087
-
23088
-cat >>confdefs.h <<\_ACEOF
23089
-#define CL_THREAD_SAFE 1
23090
-_ACEOF
23091
-
23092
-
23093
-cat >>confdefs.h <<\_ACEOF
23094
-#define _REENTRANT 1
23095
-_ACEOF
23096
-
23097
-	if test "$want_clamuko" = "yes"; then
23098
-
23099
-cat >>confdefs.h <<\_ACEOF
23100
-#define CLAMUKO 1
23101
-_ACEOF
23102
-
23103
-	fi
23104
-    fi
23105
-
23106
-cat >>confdefs.h <<\_ACEOF
23107
-#define C_BSD 1
23108
-_ACEOF
23109
-
23110
-    use_gethostbyname_r="no"
23111
-    ;;
23112 23083
 freebsd*)
23113 23084
     if test "$have_pthreads" = "yes"; then
23114
-	THREAD_LIBS="-lpthread -lc_r"
23085
+	THREAD_LIBS="-pthread -lc_r"
23115 23086
 	TH_SAFE="-thread-safe"
23116 23087
 
23117 23088
 cat >>confdefs.h <<\_ACEOF
... ...
@@ -437,22 +437,9 @@ solaris*)
437 437
     fi
438 438
     AC_DEFINE(C_SOLARIS,1,[os is solaris])
439 439
     ;;
440
-freebsd[45]*)
441
-    if test "$have_pthreads" = "yes"; then
442
-	THREAD_LIBS="-pthread -lc_r"
443
-	TH_SAFE="-thread-safe"
444
-	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
445
-	AC_DEFINE(_REENTRANT,1,[thread safe])
446
-	if test "$want_clamuko" = "yes"; then
447
-	    AC_DEFINE(CLAMUKO,1,[enable clamuko])
448
-	fi
449
-    fi
450
-    AC_DEFINE(C_BSD,1,[os is freebsd])
451
-    use_gethostbyname_r="no"
452
-    ;;
453 440
 freebsd*)
454 441
     if test "$have_pthreads" = "yes"; then
455
-	THREAD_LIBS="-lpthread -lc_r"
442
+	THREAD_LIBS="-pthread -lc_r"
456 443
 	TH_SAFE="-thread-safe"
457 444
 	AC_DEFINE(CL_THREAD_SAFE,1,[thread safe])
458 445
 	AC_DEFINE(_REENTRANT,1,[thread safe])