Disable zipcode dictionary

Change-Id: Ic1fa5c891cd2db2fc47794435a110b8489d460bf

diff --git a/configure.ac b/configure.ac
index bc8ce17..db9216c 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,11 @@ AC_INIT(src-main/main.c)
 AM_INIT_AUTOMAKE(anthy, 9100h)
 AM_CONFIG_HEADER(config.h)
 
+AC_ARG_ENABLE(zipcode,
+ [  --disable-zipcode       do not install zipcode dictionary],
+ disable_zipcode_dict=yes,
+ disable_zipcode_dict=no)
+
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
@@ -12,6 +17,7 @@ AM_PATH_LISPDIR
 AM_PROG_CC_C_O
 
 AM_CONDITIONAL(ELISP, test x$lispdir != x)
+AM_CONDITIONAL(ANTHY_INSTALL_ZIPCODE_DICT, test "$disable_zipcode_dict" = "no")
 
 dnl without emacs. install-lispLISP does mkdir /anthy
 dnl dirty hack to avoid it.

diff --git a/mkworddic/Makefile.am b/mkworddic/Makefile.am
index 09e1295..ea90e72 100755 (executable)
--- a/mkworddic/Makefile.am
+++ b/mkworddic/Makefile.am
@@ -36,5 +36,7 @@ anthy.wdic : mkworddic $(DIC_FILES)
           ./mkworddic -f ./dict.args
 
 
+if ANTHY_INSTALL_ZIPCODE_DICT
 # To install
 pkgdata_DATA = zipcode.t
+endif

diff --git a/packaging/anthy.spec b/packaging/anthy.spec
index 837a6e1..f90869b 100644 (file)
--- a/packaging/anthy.spec
+++ b/packaging/anthy.spec
@@ -39,7 +39,7 @@ cp %{SOURCE1001} .
 %reconfigure --disable-static --with-pic
 %__make %{?_smp_mflags}
 
-%configure
+%configure --disable-zipcode
 
 make