@@ -9,9 +9,6 @@

 /* enable bind8 compatibility */

 #undef BIND_8_COMPAT

-/* "build clamd" */

-#undef BUILD_CLAMD

-

 /* use ClamAuth */

 #undef CLAMAUTH

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

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

 #  MA 02110-1301, USA.

-if BUILD_CLAMD

 if HAVE_MILTER

 sbin_PROGRAMS = clamav-milter

@@ -37,7 +36,6 @@ man_MANS = $(top_builddir)/docs/man/clamav-milter.8

 AM_CFLAGS=@WERR_CFLAGS_MILTER@

 endif

-endif

 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

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

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

 #  MA 02110-1301, USA.

-if BUILD_CLAMD

-

 sbin_PROGRAMS = clamd

 clamd_SOURCES = \

@@ -46,8 +44,6 @@ if INSTALL_SYSTEMD_UNITS

 systemdsystemunit_DATA = clamav-daemon.socket clamav-daemon.service

 endif

-endif

-

 LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMD_LIBS@ @THREAD_LIBS@

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

@@ -17,8 +17,6 @@

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

 #  MA 02110-1301, USA.

-if BUILD_CLAMD

-

 bin_PROGRAMS = clamdscan

 clamdscan_SOURCES = \

@@ -29,8 +27,6 @@ clamdscan_SOURCES = \

     client.h

 AM_CFLAGS=@WERR_CFLAGS@

-endif

-

 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 LIBS = $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la @CLAMDSCAN_LIBS@ @THREAD_LIBS@

@@ -23,8 +23,6 @@ CFGINST = @CFGDIR@

 sysconf_DATA = clamd.conf.sample freshclam.conf.sample

-if BUILD_CLAMD

 if HAVE_MILTER

 sysconf_DATA += clamav-milter.conf.sample

 endif

-endif

@@ -167,9 +167,7 @@ static void help(void)

     printf("    --no-dns                             Force old non-DNS verification method\n");

     printf("    --checks=#n          -c #n           Number of checks per day, 1 <= n <= 50\n");

     printf("    --datadir=DIRECTORY                  Download new databases into DIRECTORY\n");

-#ifdef BUILD_CLAMD

     printf("    --daemon-notify[=/path/clamd.conf]   Send RELOAD command to clamd\n");

-#endif

     printf("    --local-address=IP   -a IP           Bind to IP for HTTP downloads\n");

     printf("    --on-update-execute=COMMAND          Execute COMMAND after successful update\n");

     printf("    --on-error-execute=COMMAND           Execute COMMAND if errors occurred\n");

@@ -1528,10 +1526,8 @@ fc_error_t perform_database_update(

     }

     if (0 < nTotalUpdated) {

-#ifdef BUILD_CLAMD

         if (NULL != notifyClamd)

             notify(notifyClamd);

-#endif

         if (NULL != onUpdateExecute) {

             execute("OnUpdateExecute", onUpdateExecute, bDaemonized);

@@ -1905,7 +1901,7 @@ int main(int argc, char **argv)

         /* Write PID of daemon process to pidfile. */

         if ((opt = optget(opts, "PidFile"))->enabled) {

             g_pidfile = opt->strarg;

-            if (writepid(g_pidfile)){

+            if (writepid(g_pidfile)) {

                 status = FC_EINIT;

                 goto done;

             }

@@ -1916,7 +1912,7 @@ int main(int argc, char **argv)

          * written the PidFile.  If it does not get this signal, it

          * will wait for our exit status (and we don't exit in daemon mode).

          */

-        if (parentPid != getpid()){ //we have been daemonized

+        if (parentPid != getpid()) { //we have been daemonized

             daemonize_signal_parent(parentPid);

         }

 #endif

@@ -21,8 +21,6 @@

 #include "clamav-config.h"

 #endif

-#ifdef BUILD_CLAMD

-

 #include <stdio.h>

 #ifdef HAVE_UNISTD_H

 #include <unistd.h>

@@ -176,4 +174,3 @@ int notify(const char *cfgfile)

     logg("Clamd successfully notified about the update.\n");

     return 0;

 }

-#endif

@@ -4,7 +4,6 @@ then

     LIBS="$THREAD_LIBS $LIBS"

     AC_CHECK_FUNCS([sched_yield pthread_yield])

     LIBS="$save_LIBS"

-    AC_DEFINE([BUILD_CLAMD], 1, "build clamd")

     dnl define these here, so we don't forget any system

     AC_DEFINE([CL_THREAD_SAFE],1,[thread safe])

     AC_DEFINE([_REENTRANT],1,[thread safe])

@@ -25,5 +25,4 @@ if test "$have_milter" = "yes"; then

     ])

 fi

-AM_CONDITIONAL([BUILD_CLAMD],[test "$have_pthreads" = "yes"])

 AM_CONDITIONAL([HAVE_MILTER],[test "$have_milter" = "yes"])

@@ -11,9 +11,6 @@

 /* enable bind8 compatibility */

 /* #undef BIND_8_COMPAT */

-/* "build clamd" */

-#define BUILD_CLAMD 1

-

 /* name of the clamav group */

 #define CLAMAVGROUP "clamav"

@@ -24,7 +24,6 @@ my %CONF = (

     'AC_APPLE_UNIVERSAL_BUILD' => -1,

     'ANONYMOUS_MAP' => -1,

     'BIND_8_COMPAT' => -1,

-    'BUILD_CLAMD' => '1',

     'CLAMAVGROUP' => '"clamav"',

     'CLAMAVUSER' => '"clamav"',

     'CLAMUKO' => -1,