@@ -125,6 +125,7 @@ m4_include([m4/reorganization/distcheck.m4])

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

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

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

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

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

@@ -133,17 +134,6 @@ m4_include([m4/reorganization/libs/curl.m4])

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

-AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"])

-

-AC_ARG_ENABLE([libfreshclam],

-                          [AS_HELP_STRING([--enable-libfreshclam], [enable building of libfreshclam])],

-                          enable_libfreshclam=$enableval, enable_libfreshclam="no")

-

-if test "$enable_libfreshclam" = "yes"; then

-  AC_DEFINE([ENABLE_LIBFRESHCLAM],1,[enable libfreshclam])

-fi

-AM_CONDITIONAL([ENABLE_LIBFRESHCLAM], [test "$enable_libfreshclam" = "yes"])

-

 AC_CONFIG_FILES([

 clamscan/Makefile

 database/Makefile

new file mode 100644

@@ -0,0 +1,10 @@

+AM_CONDITIONAL([ENABLE_CLAMSUBMIT], [test "$have_curl" = "yes"])

+

+AC_ARG_ENABLE([libfreshclam],

+                          [AS_HELP_STRING([--enable-libfreshclam], [enable building of libfreshclam])],

+                          enable_libfreshclam=$enableval, enable_libfreshclam="no")

+

+if test "$enable_libfreshclam" = "yes"; then

+  AC_DEFINE([ENABLE_LIBFRESHCLAM],1,[enable libfreshclam])

+fi

+AM_CONDITIONAL([ENABLE_LIBFRESHCLAM], [test "$enable_libfreshclam" = "yes"])