@@ -18,7 +18,7 @@

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

 #  MA 02110-1301, USA.

-if BUILD_CLAMD

+if BUILD_CLAMONACC

 bin_PROGRAMS = clamonacc

@@ -66,7 +66,6 @@ clamonacc_SOURCES += ./misc/fts.c

 endif

 AM_CFLAGS=@WERR_CFLAGS@

-endif

 DEFS = @DEFS@ -DCL_NOLIBCLAMAV

 LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@

@@ -74,3 +73,5 @@ 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

@@ -150,6 +150,9 @@ 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

new file mode 100644

@@ -0,0 +1,33 @@

+AC_ARG_ENABLE(clamonacc,

+	     [AC_HELP_STRING([--enable-clamonacc], [build clamonacc tool @<:@default=auto@:>@])],

+[enable_clamonacc=$enableval], [enable_clamonacc="auto"])

+

+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.]))

+			;;

+		*)

+			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

+                        ;;

+	esac

+fi

+

+

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

@@ -48,6 +48,7 @@ if test "X$have_curl" = "Xyes"; then

     fi

     save_LDFLAGS="$LDFLAGS"

     LDFLAGS="$CURL_LDFLAGS $CURL_LIBS"

+

     AC_CHECK_LIB(

         [curl],

         [curl_easy_init],

@@ -64,6 +65,7 @@ if test "X$have_curl" = "Xyes"; then

         ],

         [$CURL_LIBS]

     )

+

     LDFLAGS="$save_LDFLAGS"

 else

     AC_MSG_ERROR([libcurl not found. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit.])