From: Pietro Cerutti <gahr@gahr.ch>
Date: Sun, 13 Aug 2017 16:29:10 +0000 (+0100)
Subject: Only include libintl.h if ENABLE_NLS is defined (#718)
X-Git-Tag: neomutt-20170907~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=deb55f1b335f2eff89690637831388131a2b9b67;p=neomutt

Only include libintl.h if ENABLE_NLS is defined (#718)

This fixes a compilation error because of missing libintl.h on systems
without gettext.
---

diff --git a/alias.c b/alias.c
index 377002edd..40d80fb1a 100644
--- a/alias.c
+++ b/alias.c
@@ -23,7 +23,9 @@
 #include "config.h"
 #include <stddef.h>
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/browser.c b/browser.c
index b1805b007..a3b5702f4 100644
--- a/browser.c
+++ b/browser.c
@@ -25,7 +25,9 @@
 #include <dirent.h>
 #include <errno.h>
 #include <grp.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <locale.h>
 #include <pwd.h>
diff --git a/commands.c b/commands.c
index 23698a091..50a04fd81 100644
--- a/commands.c
+++ b/commands.c
@@ -24,7 +24,9 @@
 #include "config.h"
 #include <errno.h>
 #include <fcntl.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/compose.c b/compose.c
index 3d0be6b76..0996b32b0 100644
--- a/compose.c
+++ b/compose.c
@@ -23,7 +23,9 @@
 
 #include "config.h"
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/curs_lib.c b/curs_lib.c
index 864ab11ef..301e01dd8 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -27,7 +27,9 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <langinfo.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdarg.h>
diff --git a/curs_main.c b/curs_main.c
index b4599f334..168f7b950 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -23,7 +23,9 @@
 #include "config.h"
 #include <assert.h>
 #include <ctype.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/edit.c b/edit.c
index c69593d1c..7a768798e 100644
--- a/edit.c
+++ b/edit.c
@@ -25,7 +25,9 @@
 #include "config.h"
 #include <ctype.h>
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/handler.c b/handler.c
index 8ffdab53c..b31f4d6d5 100644
--- a/handler.c
+++ b/handler.c
@@ -24,7 +24,9 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <iconv.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/imap/browse.c b/imap/browse.c
index 5d1daef36..cac7f7f6f 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -24,7 +24,9 @@
 /* Mutt browser support routines */
 
 #include "config.h"
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/main.c b/main.c
index daffc4fdb..789697943 100644
--- a/main.c
+++ b/main.c
@@ -26,7 +26,9 @@
 
 #include "config.h"
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <locale.h>
 #include <stdbool.h>
diff --git a/menu.c b/menu.c
index ae28c2ad4..e6a84bcf5 100644
--- a/menu.c
+++ b/menu.c
@@ -22,7 +22,9 @@
 
 #include "config.h"
 #include <stddef.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <regex.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/muttlib.c b/muttlib.c
index ba9037734..6262f8698 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -27,7 +27,9 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <libgen.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <pwd.h>
 #include <regex.h>
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index d10dfcd8c..68b2caafc 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -33,7 +33,9 @@
 #include <gpg-error.h>
 #include <gpgme.h>
 #include <langinfo.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <locale.h>
 #include <stdbool.h>
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 4527594af..b111ecb9f 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -31,7 +31,9 @@
  */
 
 #include "config.h"
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index a94ea686e..93b41e812 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -23,7 +23,9 @@
  */
 
 #include "config.h"
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/pager.c b/pager.c
index 3a19681c6..c7946a6d3 100644
--- a/pager.c
+++ b/pager.c
@@ -25,7 +25,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
diff --git a/pattern.c b/pattern.c
index 1def4f61f..b634fcc47 100644
--- a/pattern.c
+++ b/pattern.c
@@ -23,7 +23,9 @@
 #include "config.h"
 #include <stddef.h>
 #include <ctype.h>
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdarg.h>
diff --git a/query.c b/query.c
index e0e46ee80..332b73c44 100644
--- a/query.c
+++ b/query.c
@@ -21,7 +21,9 @@
  */
 
 #include "config.h"
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <regex.h>
 #include <stdbool.h>
diff --git a/recvattach.c b/recvattach.c
index 29b45bbf6..cabc74667 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -22,7 +22,9 @@
  */
 
 #include "config.h"
+#ifdef ENABLE_NLS
 #include <libintl.h>
+#endif
 #include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>