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 377002eddd7aa053f0eaccf2808f16a2bd3b9b91..40d80fb1a651eb21efe69d6d19090e302e4e9300 100644 (file)
--- 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 b1805b007b7b269895b59ce05ae78b994f85be52..a3b5702f48b4c297cf53f8a950b018a42dbf8e91 100644 (file)
--- 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 23698a091fde4931893c4f854b6f833488b77eb0..50a04fd817003f1d557537b2bd4695649a0aeea4 100644 (file)
--- 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 3d0be6b760a3cb4a147824c503ef3a6f8ef32aaa..0996b32b01f62ad4da01eb0c2d48dbfd2644f9e7 100644 (file)
--- 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 864ab11ef1d03cc1d70b7b7b227c6805bb3ce5ba..301e01dd8bf49557a30e61492cd5d47f93eba350 100644 (file)
--- 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 b4599f334a56673a92623ef2022dff0e8e1f0dd2..168f7b9505ed004143849d6e8e2e7413752b531b 100644 (file)
--- 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 c69593d1c1b562481c578b4b973db2d76266bf5f..7a768798eb12ae0af730082ed7695bff3307c09e 100644 (file)
--- 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 8ffdab53cd23e4e6975c0aa7ead05a8a2de8a39e..b31f4d6d53b1e67c3dee6cc26488c7e5fabd1a7e 100644 (file)
--- 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 5d1daef3665c54ca1f6f67212d1197c47432330b..cac7f7f6f27628f3b60eecd7cf983e7c92972825 100644 (file)
--- 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 daffc4fdba123c133d1c61c71bdc8304b5960604..789697943e116eaf9b9030b0bfa7b8680ef0ea05 100644 (file)
--- 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 ae28c2ad4969ce15a210b1c2db10ad8b49e240fc..e6a84bcf59d8f9bfeef327c1ca5742edd1130f97 100644 (file)
--- 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 ba9037734a47f39cfa2a4d54d3af71e5a07a6a73..6262f8698e9197be0a8b84662a4de19ff4d93c6a 100644 (file)
--- 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 d10dfcd8c515c5f34b67f04f275c7d4d73964035..68b2caafc1bc20010764e5d0126139871c52f9a7 100644 (file)
--- 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 4527594af2051561a307090078f4e4dd743ff90d..b111ecb9f2ab29348e32fe2fc7dd3720627a6bc2 100644 (file)
--- 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 a94ea686e5ea5ed0aa68c84b602b3ca434ab6e86..93b41e8121586e6f1c3f0908f941afbd33a8a793 100644 (file)
--- 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 3a19681c6dd42e999e0f70cd07d1c4618c603801..c7946a6d383a589372e8e78a127b916daf406f69 100644 (file)
--- 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 1def4f61f3b17aa1c0843742e04b87876f64a174..b634fcc4700e2ff5cf9549fe44673842a373ebc2 100644 (file)
--- 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 e0e46ee8095e7c469f04ccb066dfb1b7059dc1c1..332b73c44af2eb284d194831a859197e18c3d6b4 100644 (file)
--- 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 29b45bbf6913f531a3fa1083083199e5635506a5..cabc746677f0bd0c7accdbbee4d9bd360ed16419 100644 (file)
--- 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>