diff -burN clamav-0.93/clamav-milter/clamav-milter.c clamav-0.93-nls/clamav-milter/clamav-milter.c --- clamav-0.93/clamav-milter/clamav-milter.c 2008-04-09 17:39:18.000000000 +0200 +++ clamav-0.93-nls/clamav-milter/clamav-milter.c 2008-04-14 18:31:36.000000000 +0200 @@ -110,6 +110,7 @@ #ifdef C_LINUX #include /* FIXME: use sendfile on BSD not Linux */ +#ifdef ENABLE_NLS #include #include @@ -122,7 +123,8 @@ #define _(s) s #define N_(s) s -#endif +#endif /* ENABLE_NLS */ +#endif /* C_LINUX */ #ifdef USE_SYSLOG #include @@ -713,7 +715,7 @@ else progname = "clamav-milter"; -#ifdef C_LINUX +#ifdef ENABLE_NLS setlocale(LC_ALL, ""); bindtextdomain(progname, DATADIR"/clamav-milter/locale"); textdomain(progname); diff -burN clamav-0.93/configure.in clamav-0.93-nls/configure.in --- clamav-0.93/configure.in 2008-04-09 17:40:33.000000000 +0200 +++ clamav-0.93-nls/configure.in 2008-04-14 18:31:36.000000000 +0200 @@ -399,6 +399,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([dns], AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]), [want_dns=$enableval], [want_dns=yes] diff -burN clamav-0.93/shared/getopt.c clamav-0.93-nls/shared/getopt.c --- clamav-0.93/shared/getopt.c 2008-03-06 19:41:02.000000000 +0100 +++ clamav-0.93-nls/shared/getopt.c 2008-04-14 18:31:36.000000000 +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 # ifndef _ # define _(msgid) gettext (msgid) diff -burN clamav-0.93/shared/output.c clamav-0.93-nls/shared/output.c --- clamav-0.93/shared/output.c 2008-03-06 19:41:02.000000000 +0100 +++ clamav-0.93-nls/shared/output.c 2008-04-14 18:31:36.000000000 +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 #include