1. clamav-devel
  2. Commit 85f1531f8821fe107a51f84f5040595b5e291877
Browse code

darwin IS thread safe (bb #1534).

darwin* never defined CL_THREAD_SAFE, which was probably the cause for bug
I found this out when fixing the no pthreads case (bb #1897) and accidentally
broke it instead of fixing it. The Mac OS X buildbot failed.

This commit moves the CL_THREAD_SAFE definition to the same place as BUILD_CLAMD
(have_pthreads=yes) so no system with pthread is forgotten.
darwin has pthread in libc so no linker flags are needed (which is probably why
defining CL_THREAD_SAFE was forgotten)

Török Edvin authored on 2010/05/07 19:09:30
Showing 3 changed files
ChangeLog
History View file @ 85f1531
... ... 
@@ -1,3 +1,7 @@
1 
+Fri May  7 13:06:48 EEST 2010 (edwin)
2 
+-------------------------------------
3 
+ * configure: darwin* IS thread safe (bb #1534)
4 
+
1 5 
 Fri May  7 10:48:48 EEST 2010 (edwin)
2 6 
 -------------------------------------
3 7 
  * libclamav/c++/configure: add check that correct libstdc++ version is used (bb #1971)
configure
History View file @ 85f1531
... ... 
@@ -16673,12 +16673,6 @@ $as_echo "#define C_LINUX 1" >>confdefs.h
16673 16673 
     if test "$have_pthreads" = "yes"; then
16674 16674 
 	THREAD_LIBS="-lpthread"
16675 16675 
 	TH_SAFE="-thread-safe"
16676 
-
16677 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16678 
-
16679 
-
16680 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16681 
-
16682 16676 
 	if test "$want_clamuko" = "yes"; then
16683 16677
16684 16678 
 $as_echo "#define CLAMUKO 1" >>confdefs.h
... ... 
@@ -16693,12 +16687,6 @@ $as_echo "#define C_KFREEBSD_GNU 1" >>confdefs.h
16693 16693 
     if test "$have_pthreads" = "yes"; then
16694 16694 
        THREAD_LIBS="-lpthread"
16695 16695 
        TH_SAFE="-thread-safe"
16696 
-
16697 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16698 
-
16699 
-
16700 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16701 
-
16702 16696 
        if test "$want_clamuko" = "yes"; then
16703 16697
16704 16698 
 $as_echo "#define CLAMUKO 1" >>confdefs.h
... ... 
@@ -16713,12 +16701,6 @@ solaris*)
16713 16713 
 	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
16714 16714 
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
16715 16715 
 	TH_SAFE="-thread-safe"
16716 
-
16717 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16718 
-
16719 
-
16720 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16721 
-
16722 16716 
     fi
16723 16717
16724 16718 
 $as_echo "#define C_SOLARIS 1" >>confdefs.h
... ... 
@@ -16728,12 +16710,6 @@ freebsd[45]*)
16728 16728 
     if test "$have_pthreads" = "yes"; then
16729 16729 
 	THREAD_LIBS="-pthread -lc_r"
16730 16730 
 	TH_SAFE="-thread-safe"
16731 
-
16732 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16733 
-
16734 
-
16735 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16736 
-
16737 16731 
 	if test "$want_clamuko" = "yes"; then
16738 16732
16739 16733 
 $as_echo "#define CLAMUKO 1" >>confdefs.h
... ... 
@@ -16748,12 +16724,6 @@ freebsd*)
16748 16748 
     if test "$have_pthreads" = "yes"; then
16749 16749 
 	THREAD_LIBS="-lthr"
16750 16750 
 	TH_SAFE="-thread-safe"
16751 
-
16752 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16753 
-
16754 
-
16755 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16756 
-
16757 16751 
 	if test "$want_clamuko" = "yes"; then
16758 16752
16759 16753 
 $as_echo "#define CLAMUKO 1" >>confdefs.h
... ... 
@@ -16768,12 +16738,6 @@ dragonfly*)
16768 16768 
     if test "$have_pthreads" = "yes"; then
16769 16769 
 	THREAD_LIBS="-pthread"
16770 16770 
 	TH_SAFE="-thread-safe"
16771 
-
16772 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16773 
-
16774 
-
16775 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16776 
-
16777 16771 
 	if test "$want_clamuko" = "yes"; then
16778 16772
16779 16773 
 $as_echo "#define CLAMUKO 1" >>confdefs.h
... ... 
@@ -16790,12 +16754,6 @@ openbsd*)
16790 16790 
 	CLAMD_LIBS="$CLAMD_LIBS -pthread"
16791 16791 
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
16792 16792 
 	TH_SAFE="-thread-safe"
16793 
-
16794 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16795 
-
16796 
-
16797 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16798 
-
16799 16793 
     fi
16800 16794
16801 16795 
 $as_echo "#define C_BSD 1" >>confdefs.h
... ... 
@@ -16805,12 +16763,6 @@ bsdi*)
16805 16805 
     if test "$have_pthreads" = "yes"; then
16806 16806 
 	THREAD_LIBS="-pthread"
16807 16807 
 	TH_SAFE="-thread-safe"
16808 
-
16809 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16810 
-
16811 
-
16812 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16813 
-
16814 16808 
     fi
16815 16809
16816 16810 
 $as_echo "#define C_BSD 1" >>confdefs.h
... ... 
@@ -16819,12 +16771,6 @@ $as_echo "#define C_BSD 1" >>confdefs.h
16819 16819 
 netbsd*)
16820 16820 
      if test "$have_pthreads" = "yes"; then
16821 16821 
 	THREAD_LIBS="-lpthread"
16822 
-
16823 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16824 
-
16825 
-
16826 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16827 
-
16828 16822 
      fi
16829 16823
16830 16824 
 $as_echo "#define C_BSD 1" >>confdefs.h
... ... 
@@ -16865,12 +16811,6 @@ os2*)
16865 16865 
     if test "$have_pthreads" = "yes"; then
16866 16866 
 	THREAD_LIBS="-lpthread"
16867 16867 
 	TH_SAFE="-thread-safe"
16868 
-
16869 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16870 
-
16871 
-
16872 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16873 
-
16874 16868 
     fi
16875 16869
16876 16870 
 $as_echo "#define C_OS2 1" >>confdefs.h
... ... 
@@ -16882,12 +16822,6 @@ hpux*)
16882 16882 
     if test "$have_pthreads" = "yes"; then
16883 16883 
 	THREAD_LIBS="-lpthread"
16884 16884 
 	TH_SAFE="-thread-safe"
16885 
-
16886 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16887 
-
16888 
-
16889 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16890 
-
16891 16885 
     fi
16892 16886
16893 16887 
 $as_echo "#define C_HPUX 1" >>confdefs.h
... ... 
@@ -16898,12 +16832,6 @@ aix*)
16898 16898 
 	THREAD_LIBS="-lpthread"
16899 16899 
 	TH_SAFE="-thread-safe"
16900 16900
16901 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16902 
-
16903 
-
16904 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16905 
-
16906 
-
16907 16901 
 $as_echo "#define _THREAD_SAFE 1" >>confdefs.h
16908 16902
16909 16903 
     fi
... ... 
@@ -16916,12 +16844,6 @@ $as_echo "#define C_AIX 1" >>confdefs.h
16916 16916 
 	THREAD_LIBS="-pthread"
16917 16917 
 	TH_SAFE="-thread-safe"
16918 16918
16919 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16920 
-
16921 
-
16922 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16923 
-
16924 
-
16925 16919 
 $as_echo "#define _POSIX_PII_SOCKET 1" >>confdefs.h
16926 16920
16927 16921 
     fi
... ... 
@@ -16930,14 +16852,6 @@ $as_echo "#define C_OSF 1" >>confdefs.h
16930 16930
16931 16931 
     ;;
16932 16932 
 nto-qnx*)
16933 
-     if test "$have_pthreads" = "yes"; then
16934 
-
16935 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16936 
-
16937 
-
16938 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16939 
-
16940 
-     fi
16941 16933
16942 16934 
 $as_echo "#define C_QNX6 1" >>confdefs.h
16943 16935
... ... 
@@ -16946,12 +16860,6 @@ irix*)
16946 16946 
     if test "$have_pthreads" = "yes"; then
16947 16947 
 	THREAD_LIBS="-lpthread"
16948 16948 
 	TH_SAFE="-thread-safe"
16949 
-
16950 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16951 
-
16952 
-
16953 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16954 
-
16955 16949 
     fi
16956 16950 
     LIBS="$LIBS -lgen"
16957 16951
... ... 
@@ -16970,12 +16878,6 @@ $as_echo "#define C_INTERIX 1" >>confdefs.h
16970 16970 
     if test "$have_pthreads" = "yes"; then
16971 16971 
 	THREAD_LIBS="-lpthread"
16972 16972 
 	TH_SAFE="-thread-safe"
16973 
-
16974 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16975 
-
16976 
-
16977 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16978 
-
16979 16973 
     fi
16980 16974 
     ;;
16981 16975 
 gnu*)
... ... 
@@ -16985,12 +16887,6 @@ $as_echo "#define C_GNU_HURD 1" >>confdefs.h
16985 16985 
     if test "$have_pthreads" = "yes"; then
16986 16986 
        THREAD_LIBS="-lpthread"
16987 16987 
        TH_SAFE="-thread-safe"
16988 
-
16989 
-$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
16990 
-
16991 
-
16992 
-$as_echo "#define _REENTRANT 1" >>confdefs.h
16993 
-
16994 16988 
     fi
16995 16989 
     ;;
16996 16990 
 *)
... ... 
@@ -17214,6 +17110,12 @@ done
17214 17214
17215 17215 
 $as_echo "#define BUILD_CLAMD 1" >>confdefs.h
17216 17216
17217 
+
17218 
+$as_echo "#define CL_THREAD_SAFE 1" >>confdefs.h
17219 
+
17220 
+
17221 
+$as_echo "#define _REENTRANT 1" >>confdefs.h
17222 
+
17217 17223 
 fi
17218 17224
17219 17225
configure.in
History View file @ 85f1531
... ... 
@@ -928,8 +928,6 @@ linux*)
928 928 
     if test "$have_pthreads" = "yes"; then
929 929 
 	THREAD_LIBS="-lpthread"
930 930 
 	TH_SAFE="-thread-safe"
931 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
932 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
933 931 
 	if test "$want_clamuko" = "yes"; then
934 932 
 	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
935 933 
 	fi
... ... 
@@ -940,8 +938,6 @@ kfreebsd*-gnu)
940 940 
     if test "$have_pthreads" = "yes"; then
941 941 
        THREAD_LIBS="-lpthread"
942 942 
        TH_SAFE="-thread-safe"
943 
-       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
944 
-       AC_DEFINE([_REENTRANT],1,[thread safe])
945 943 
        if test "$want_clamuko" = "yes"; then
946 944 
            AC_DEFINE([CLAMUKO],1,[enable clamuko])
947 945 
        fi
... ... 
@@ -954,8 +950,6 @@ solaris*)
954 954 
 	CLAMD_LIBS="$CLAMD_LIBS -lresolv"
955 955 
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lresolv"
956 956 
 	TH_SAFE="-thread-safe"
957 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
958 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
959 957 
     fi
960 958 
     AC_DEFINE([C_SOLARIS],1,[os is solaris])
961 959 
     ;;
... ... 
@@ -963,8 +957,6 @@ freebsd[[45]]*)
963 963 
     if test "$have_pthreads" = "yes"; then
964 964 
 	THREAD_LIBS="-pthread -lc_r"
965 965 
 	TH_SAFE="-thread-safe"
966 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
967 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
968 966 
 	if test "$want_clamuko" = "yes"; then
969 967 
 	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
970 968 
 	fi
... ... 
@@ -975,8 +967,6 @@ freebsd*)
975 975 
     if test "$have_pthreads" = "yes"; then
976 976 
 	THREAD_LIBS="-lthr"
977 977 
 	TH_SAFE="-thread-safe"
978 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
979 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
980 978 
 	if test "$want_clamuko" = "yes"; then
981 979 
 	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
982 980 
 	fi
... ... 
@@ -987,8 +977,6 @@ dragonfly*)
987 987 
     if test "$have_pthreads" = "yes"; then
988 988 
 	THREAD_LIBS="-pthread"
989 989 
 	TH_SAFE="-thread-safe"
990 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
991 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
992 990 
 	if test "$want_clamuko" = "yes"; then
993 991 
 	    AC_DEFINE([CLAMUKO],1,[enable clamuko])
994 992 
 	fi
... ... 
@@ -1001,8 +989,6 @@ openbsd*)
1001 1001 
 	CLAMD_LIBS="$CLAMD_LIBS -pthread"
1002 1002 
 	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
1003 1003 
 	TH_SAFE="-thread-safe"
1004 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1005 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1006 1004 
     fi
1007 1005 
     AC_DEFINE([C_BSD],1,[os is OpenBSD])
1008 1006 
     ;;
... ... 
@@ -1010,16 +996,12 @@ bsdi*)
1010 1010 
     if test "$have_pthreads" = "yes"; then
1011 1011 
 	THREAD_LIBS="-pthread"
1012 1012 
 	TH_SAFE="-thread-safe"
1013 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1014 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1015 1013 
     fi
1016 1014 
     AC_DEFINE([C_BSD],1,[os is BSDI BSD/OS])
1017 1015 
     ;;
1018 1016 
 netbsd*)
1019 1017 
      if test "$have_pthreads" = "yes"; then
1020 1018 
 	THREAD_LIBS="-lpthread"
1021 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1022 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1023 1019 
      fi
1024 1020 
     AC_DEFINE([C_BSD],1,[os is NetBSD])
1025 1021 
     ;;
... ... 
@@ -1046,8 +1028,6 @@ os2*)
1046 1046 
     if test "$have_pthreads" = "yes"; then
1047 1047 
 	THREAD_LIBS="-lpthread"
1048 1048 
 	TH_SAFE="-thread-safe"
1049 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1050 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1051 1049 
     fi
1052 1050 
     AC_DEFINE([C_OS2],1,[os is OS/2])
1053 1051 
     ;;
... ... 
@@ -1061,8 +1041,6 @@ hpux*)
1061 1061 
     if test "$have_pthreads" = "yes"; then
1062 1062 
 	THREAD_LIBS="-lpthread"
1063 1063 
 	TH_SAFE="-thread-safe"
1064 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1065 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1066 1064 
     fi
1067 1065 
     AC_DEFINE([C_HPUX],1,[os is hpux])
1068 1066 
     ;;
... ... 
@@ -1070,8 +1048,6 @@ aix*)
1070 1070 
     if test "$have_pthreads" = "yes"; then
1071 1071 
 	THREAD_LIBS="-lpthread"
1072 1072 
 	TH_SAFE="-thread-safe"
1073 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1074 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1075 1073 
 	AC_DEFINE([_THREAD_SAFE],1,[thread safe])
1076 1074 
     fi
1077 1075 
     AC_DEFINE([C_AIX],1,[os is aix])
... ... 
@@ -1080,25 +1056,17 @@ aix*)
1080 1080 
     if test "$have_pthreads" = "yes"; then
1081 1081 
 	THREAD_LIBS="-pthread"
1082 1082 
 	TH_SAFE="-thread-safe"
1083 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1084 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1085 1083 
 	AC_DEFINE([_POSIX_PII_SOCKET],1,[POSIX compatibility])
1086 1084 
     fi
1087 1085 
     AC_DEFINE([C_OSF],1,[os is osf/tru64])
1088 1086 
     ;;
1089 1087 
 nto-qnx*)
1090 
-     if test "$have_pthreads" = "yes"; then
1091 
-       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1092 
-       AC_DEFINE([_REENTRANT],1,[thread safe])
1093 
-     fi
1094 1088 
     AC_DEFINE([C_QNX6],1,[os is QNX 6.x.x])
1095 1089 
     ;;
1096 1090 
 irix*)
1097 1091 
     if test "$have_pthreads" = "yes"; then
1098 1092 
 	THREAD_LIBS="-lpthread"
1099 1093 
 	TH_SAFE="-thread-safe"
1100 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1101 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1102 1094 
     fi
1103 1095 
     LIBS="$LIBS -lgen"
1104 1096 
     AC_DEFINE([C_IRIX],1,[os is irix])
... ... 
@@ -1113,8 +1081,6 @@ interix*)
1113 1113 
     if test "$have_pthreads" = "yes"; then
1114 1114 
 	THREAD_LIBS="-lpthread"
1115 1115 
 	TH_SAFE="-thread-safe"
1116 
-	AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1117 
-	AC_DEFINE([_REENTRANT],1,[thread safe])
1118 1116 
     fi
1119 1117 
     ;;
1120 1118 
 gnu*)
... ... 
@@ -1122,8 +1088,6 @@ gnu*)
1122 1122 
     if test "$have_pthreads" = "yes"; then
1123 1123 
        THREAD_LIBS="-lpthread"
1124 1124 
        TH_SAFE="-thread-safe"
1125 
-       AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1126 
-       AC_DEFINE([_REENTRANT],1,[thread safe])
1127 1125 
     fi
1128 1126 
     ;;
1129 1127 
 *)
... ... 
@@ -1174,6 +1138,9 @@ then
1174 1174 
     AC_CHECK_FUNCS([sched_yield pthread_yield])
1175 1175 
     LIBS="$save_LIBS"
1176 1176 
     AC_DEFINE([BUILD_CLAMD], 1, "build clamd")
1177 
+    dnl define these here, so we don't forget any system
1178 
+    AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])
1179 
+    AC_DEFINE([_REENTRANT],1,[thread safe])
1177 1180 
 fi
1178 1181
1179 1182 
 dnl Check for readdir_r and number of its arguments