diff -Naur clamav-0.94.orig/clamav-milter/clamav-milter.c clamav-0.94.1rc1/clamav-milter/clamav-milter.c
--- clamav-0.94.2.orig/clamav-milter/clamav-milter.c 2008-09-01 19:19:44.000000000 +0200
+++ clamav-0.94.2/clamav-milter/clamav-milter.c 2008-09-05 21:16:03.507610741 +0200
@@ -110,6 +110,7 @@
#ifdef C_LINUX
#include <sys/sendfile.h> /* FIXME: use sendfile on BSD not Linux */
+#ifdef ENABLE_NLS
#include <libintl.h>
#include <locale.h>
@@ -122,7 +123,8 @@
#define _(s) s
#define N_(s) s
-#endif
+#endif /* ENABLE_NLS */
+#endif /* C_LINUX */
#ifdef USE_SYSLOG
#include <syslog.h>
@@ -771,7 +773,7 @@
else
progname = "clamav-milter";
-#ifdef C_LINUX
+#ifdef ENABLE_NLS
setlocale(LC_ALL, "");
bindtextdomain(progname, DATADIR"/clamav-milter/locale");
textdomain(progname);
diff -Naur clamav-0.94.orig/configure.in clamav-0.94.1rc1/configure.in
--- clamav-0.94.orig/configure.in 2008-09-05 21:11:13.672860000 +0200
+++ clamav-0.94.2/configure.in 2008-09-05 21:14:46.199611070 +0200
@@ -490,6 +490,14 @@
[ --disable-unrar don't build libclamunrar and libclamunrar_iface ],
want_unrar=$enableval, want_unrar="yes")
+AC_ARG_ENABLE([nls],
+ AC_HELP_STRING([--disable-nls], [disable NLS support]),
+ [want_nls=$enableval], [want_nls=yes]
+)
+if test $want_nls = yes; then
+ CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
+fi
+
AC_ARG_ENABLE([ipv6],
[ --disable-ipv6 disable IPv6 support],
want_ipv6=$enableval, want_ipv6="yes")
diff -Naur clamav-0.94.orig/shared/getopt.c clamav-0.94.1rc1/shared/getopt.c
--- clamav-0.94.orig/shared/getopt.c 2008-08-16 19:18:00.000000000 +0200
+++ clamav-0.94.2/shared/getopt.c 2008-09-05 21:17:31.723611661 +0200
@@ -82,7 +82,7 @@
#ifndef _
/* This is for other GNU distributions with internationalized messages. */
-# if defined HAVE_LIBINTL_H || defined _LIBC
+# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
# include <libintl.h>
# ifndef _
# define _(msgid) gettext (msgid)
diff -Naur clamav-0.94.orig/shared/output.c clamav-0.94.1rc1/shared/output.c
--- clamav-0.94.orig/shared/output.c 2008-08-16 19:18:00.000000000 +0200
+++ clamav-0.94.2/shared/output.c 2008-09-05 21:13:17.334852520 +0200
@@ -61,7 +61,7 @@
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
-#ifdef C_LINUX
+#if defined(C_LINUX) && defined(ENABLE_NLS)
#include <libintl.h>
#include <locale.h>