openbsd-ports/security/clamav/patches/patch-configure

$OpenBSD: patch-configure,v 1.5 2006/08/15 18:48:22 mbalmer Exp $
--- configure.orig	Sat Jul  1 13:12:52 2006
+++ configure	Mon Jul 31 20:02:42 2006
@@ -11828,11 +11828,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef __cplusplus
 extern "C"
 #endif
-char bzReadOpen ();
+char BZ2_bzReadOpen ();
 int
 main ()
 {
-return bzReadOpen ();
+return BZ2_bzReadOpen ();
   ;
   return 0;
 }
@@ -12248,6 +12248,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
+#include <sys/types.h>
+#include <netinet/in.h>
 #include <resolv.h>
 _ACEOF
 rm -f conftest.$ac_objext
@@ -13293,13 +13295,9 @@ _ACEOF
 openbsd*)
     if test "$have_pthreads" = "yes"; then
 	LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -pthread"
-	if test "$use_cr" = "no"; then
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
-	else
-	    CLAMD_LIBS="$CLAMD_LIBS -pthread -lc_r"
-	    CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread -lc_r"
-	fi
+	ADDITIONAL_LIBS="-pthread"
+	CLAMD_LIBS="$CLAMD_LIBS -pthread"
+	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -pthread"
 	TH_SAFE="-thread-safe"
 
 cat >>confdefs.h <<\_ACEOF
@@ -14497,6 +14495,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <sys/types.h>
 #include <tcpd.h>
 int allow_severity = 0;
 int deny_severity  = 0;
@@ -14565,6 +14564,7 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
+#include <sys/types.h>
 #include <tcpd.h>
 int allow_severity = 0;
 int deny_severity  = 0;