michael@234: diff -Nau clamav-milter/clamav-milter.c.orig clamav-milter/clamav-milter.c
michael@226: Index: clamav-milter/clamav-milter.c
michael@234: --- clamav-milter/clamav-milter.c.orig	2009-10-28 16:34:13.000000000 +0100
michael@234: +++ clamav-milter/clamav-milter.c	2009-11-01 15:26:46.212861448 +0100
michael@226: @@ -32,7 +32,7 @@
michael@226:  #include <syslog.h>
michael@226:  #endif
michael@226:  #include <time.h>
michael@226: -#include <libmilter/mfapi.h>
michael@226: +#include "milter/mfapi.h"
michael@226:  
michael@226:  #include "clamav.h"
michael@226:  
michael@234: diff -Nau clamav-milter/clamfi.c.orig clamav-milter/clamfi.c
michael@226: Index: clamav-milter/clamfi.c
michael@234: --- clamav-milter/clamfi.c.orig	2009-10-28 16:34:13.000000000 +0100
michael@234: +++ clamav-milter/clamfi.c	2009-11-01 15:26:46.214251049 +0100
michael@226: @@ -29,7 +29,7 @@
michael@226:  #include <unistd.h>
michael@226:  #include <ctype.h>
michael@226:  
michael@226: -#include <libmilter/mfapi.h>
michael@226: +#include "milter/mfapi.h"
michael@226:  
michael@226:  #include "shared/optparser.h"
michael@226:  #include "shared/output.h"
michael@234: diff -Nau clamav-milter/clamfi.h.orig clamav-milter/clamfi.h
michael@226: Index: clamav-milter/clamfi.h
michael@234: --- clamav-milter/clamfi.h.orig	2009-07-06 15:21:58.000000000 +0200
michael@234: +++ clamav-milter/clamfi.h	2009-11-01 15:26:46.214882752 +0100
michael@226: @@ -22,7 +22,7 @@
michael@226:  #define _CLAMFI_H
michael@226:  
michael@226:  #include "shared/optparser.h"
michael@226: -#include <libmilter/mfapi.h>
michael@226: +#include "milter/mfapi.h"
michael@226:  
michael@226:  extern uint64_t maxfilesize;
michael@226:  extern int addxvirus;
michael@234: diff -Nau configure.orig configure
michael@226: Index: configure
michael@234: --- configure.orig	2009-10-28 16:34:13.000000000 +0100
michael@234: +++ configure	2009-11-01 15:29:06.145022137 +0100
michael@234: @@ -16692,9 +16692,6 @@
michael@226:  
michael@226:          save_LIBS="$LIBS"
michael@226:      CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -lpthread"
michael@226: -    if test -d /usr/lib/libmilter ; then
michael@226: -	CLAMAV_MILTER_LIBS="$CLAMAV_MILTER_LIBS -L/usr/lib/libmilter"
michael@226: -    fi
michael@226:      LIBS="$LIBS -lmilter $CLAMAV_MILTER_LIBS"
michael@234:      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
michael@226:  $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
michael@234: @@ -16842,9 +16839,9 @@
michael@234:  fi
michael@226:  
michael@226:      LIBS="$save_LIBS"
michael@234: -    for ac_header in libmilter/mfapi.h
michael@234: +    for ac_header in milter/mfapi.h
michael@234:  do :
michael@234: -  ac_fn_c_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
michael@234: +  ac_fn_c_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
michael@234:  if test "x$ac_cv_header_libmilter_mfapi_h" = x""yes; then :
michael@234:    cat >>confdefs.h <<_ACEOF
michael@234:  #define HAVE_LIBMILTER_MFAPI_H 1
michael@234: diff -Nau libclamav/others.c.orig libclamav/others.c
michael@226: Index: libclamav/others.c
michael@234: --- libclamav/others.c.orig	2009-10-28 16:34:13.000000000 +0100
michael@234: +++ libclamav/others.c	2009-11-01 15:26:46.257883269 +0100
michael@234: @@ -177,8 +177,10 @@
michael@226:      if(is_rar_initd) return;
michael@226:      is_rar_initd = 1;
michael@226:  
michael@226: +#if 0
michael@226:      rhandle = lt_dlfind("libclamunrar_iface", "unrar");
michael@226:      if (!rhandle)
michael@226: +#endif
michael@226:  	return;
michael@226:  
michael@226:      if (!(cli_unrar_open = (int(*)(int, const char *, unrar_state_t *))lt_dlsym(rhandle, "libclamunrar_iface_LTX_unrar_open")) ||
michael@234: diff -Nau shared/output.c.orig shared/output.c
michael@226: Index: shared/output.c
michael@234: --- shared/output.c.orig	2009-10-28 16:34:13.000000000 +0100
michael@234: +++ shared/output.c	2009-11-01 15:26:46.259056039 +0100
michael@226: @@ -67,7 +67,7 @@
michael@226:  pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
michael@226:  #endif
michael@226:  
michael@226: -#ifdef  C_LINUX
michael@226: +#if 0
michael@226:  #include <libintl.h>
michael@226:  #include <locale.h>
michael@226: