@@ -25,6 +25,10 @@ EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.

 bin_SCRIPTS=clamav-config

+if BUILD_CLAMONACC

+SUBDIRS += clamonacc

+endif

+

 if ENABLE_CLAMSUBMIT

 SUBDIRS += clamsubmit

 endif

@@ -18,8 +18,6 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

-if BUILD_CLAMONACC

-

 bin_PROGRAMS = clamonacc

 clamonacc_CPPFLAGS="-g"

@@ -74,4 +72,3 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamd -I$(top_srcdir)/shared -I$(t

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamonacc$(EXEEXT)

 CLEANFILES=*.gcda *.gcno

-endif

@@ -145,14 +145,14 @@ m4_include([m4/reorganization/code_checks/fts.m4])

 m4_include([m4/reorganization/prelude.m4])

 m4_include([m4/reorganization/bsd.m4])

+dnl Clamonacc loading

+m4_include([m4/reorganization/clamonacc.m4])

+

 dnl Freshclam dependencies

 m4_include([m4/reorganization/libs/curl.m4])

 m4_include([m4/reorganization/substitutions.m4])

 m4_include([m4/reorganization/strni.m4])

-dnl Clamonacc loading

-m4_include([m4/reorganization/clamonacc.m4])

-

 if test "x$use_internal_mspack" = "xyes"; then

     mspack_msg="Internal"

     AC_SYS_LARGEFILE

@@ -192,7 +192,6 @@ clamd/Makefile

 clamd/clamav-daemon.service

 clamd/clamav-daemon.socket

 clamdscan/Makefile

-clamonacc/Makefile

 clamsubmit/Makefile

 clamav-milter/Makefile

 freshclam/clamav-freshclam.service

@@ -226,6 +225,9 @@ docs/man/clamsubmit.1

 clamav-types.h

 ])

+AM_COND_IF([BUILD_CLAMONACC],

+           [AC_CONFIG_FILES([clamonacc/Makefile])])

+

 # Define variables needed to generate clamav-types.h.

 m4_include([m4/reorganization/types.m4])

@@ -6,27 +6,18 @@ if test "$enable_clamonacc" != "no"; then

 	AC_CANONICAL_HOST

         case "${host_os}" in

-

         	linux*)

-			LIBCURL_CHECK_CONFIG(

-			[],

-			[7.40.0],

-			[$enable_clamonacc="yes"], 

-			[AC_MSG_ERROR([Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.40 or higher.]])

-			)

-			dnl AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[

-			dnl	int x;

-			dnl	curl_easy_setopt(NULL,CURLOPT_URL,NULL);

-			dnl	x=CURLOPT_UNIX_SOCKET_PATH;

-			dnl	if (x) {;}]])],$enable_clamonacc="yes", AC_MSG_ERROR([Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.40 or higher.]))

+			AM_CONDITIONAL([BUILD_CLAMONACC], [test x$enable_clamonacc != xno])

 			;;

 		*)

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

 				AC_MSG_ERROR([Clamonacc was explicitly requested, but the platform ($host_os) you are trying to build on is not currently supported for this tool.])

 			fi

+			AM_CONDITIONAL([BUILD_CLAMONACC], [test x$enable_clamonacc == xno])

                         ;;

 	esac

+else

+	AM_CONDITIONAL([BUILD_CLAMONACC], [test x$enable_clamonacc == xyes])

 fi

-AM_CONDITIONAL([BUILD_CLAMONACC], [test x$enable_clamonacc == xyes])

@@ -49,6 +49,14 @@ if test "X$have_curl" = "Xyes"; then

     save_LDFLAGS="$LDFLAGS"

     LDFLAGS="$CURL_LDFLAGS $CURL_LIBS"

+	AM_COND_IF([BUILD_CLAMONACC], 

+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[

+				int x;

+				curl_easy_setopt(NULL,CURLOPT_URL,NULL);

+				x=CURLOPT_UNIX_SOCKET_PATH;

+                                x=CURLINFO_ACTIVESOCKET;

+				if (x) {;}]])],$enable_clamonacc="yes", AC_MSG_ERROR([Your libcurl (e.g. libcurl-devel) is too old. ClamAV requires libcurl 7.45 or higher.])))

+

     AC_CHECK_LIB(

         [curl],

         [curl_easy_init],