We don't need to build in the charmaps/ directory unless we use the

included iconv.

diff --git a/Makefile.am b/Makefile.am
index e262710c4f4e4aa422db9b71bfdd7d4b209efa15..18662afbcba70e65b0e226272e720ace4ac9dc96 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_PROGRAMS = mutt_dotlock pgpring makedoc
 
-if BUILD_CHARMAPS
-CHARMAP_SUBDIR = charmaps
-endif
-
 if BUILD_IMAP
 IMAP_SUBDIR = imap
 IMAP_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/imap
@@ -16,6 +12,10 @@ endif
 if BUILD_ICONV
 ICONV_SUBDIR = iconv
 ICONV_INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/iconv
+if BUILD_CHARMAPS
+CHARMAP_SUBDIR = charmaps
+endif
+
 endif
 
 SUBDIRS = m4 po intl doc contrib $(CHARMAP_SUBDIR) $(IMAP_SUBDIR) $(ICONV_SUBDIR)