#840: bencode.c (and others) does not compile without libintl.h

diff --git a/configure.ac b/configure.ac
index 77f7de0f258283e71a5311f12bd7d2e88ad5ab1c..c0b5f8b44f920a6539662d85802a242f60f28e3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ if test "x$use_libnotify" = "xyes"; then
     AC_DEFINE([HAVE_LIBNOTIFY], 1)
 fi
 
+AC_CHECK_HEADERS([libintl.h])
 IT_PROG_INTLTOOL([0.23],[no-xml])
 GETTEXT_PACKAGE=transmission
 AC_SUBST(GETTEXT_PACKAGE)

diff --git a/libtransmission/utils.h b/libtransmission/utils.h
index 9650f7e0ab6b8898ec0aeaf204db2def9bb4e5a0..948f97619e651a694e8bf15eea80fcb1d5d7cfa6 100644 (file)
--- a/libtransmission/utils.h
+++ b/libtransmission/utils.h
@@ -35,14 +35,14 @@ void tr_msgInit( void );
 #if !defined(_)
 #if defined(SYS_DARWIN)
   /*#include <CoreFoundation/CFBundle.h>
-  
   const char * tr_getMacLocalizedCString(CFStringRef string);
-  
   #define _(a) tr_getMacLocalizedCString(CFSTR(a))*/
   #define _(a) (a)
-#else
+#elif HAVE_LIBINTL
   #include <libintl.h>
   #define _(a) gettext (a)
+#else
+  #define _(a) (a)
 #endif
 #endif