Make sure prooftools for alternative orthographies are not built when…

… they are turned off in configure.ac. Bump bugfix.

am-shared/src-fst-dir-include.am

@@ -217,8 +217,10 @@ hfstdata_DATA=$(GT_ANALYSERS)       \
 			  $(ALT_ORTH_GENERATORS)\
 			  $(CUSTOM_FSTS)
 
-noinst_DATA=$(GT_RAW)              \
-			$(GT_FSTs_NO_INSTALL)
+noinst_DATA=$(GT_RAW)               \
+			  $(GT_PROOF_ANALYSERS) \
+			  $(GT_PROOF_GENERATORS)\
+			  $(GT_FSTs_NO_INSTALL)
 
 ##################################################
 ######## Build rules for Xerox and HFST: #########

am-shared/src_alt_orth-include.am

@@ -8,15 +8,20 @@
 # IFF alternative orthographies are defined:
 if HAVE_ALT_ORTHS
 
+if WANT_ALT_ORTH_PROOFTOOLS
+ALT_ORTH_PROOF_ANALYSERS=$(GT_PROOF_ANALYSERS)
+ALT_ORTH_PROOF_GENERATORS=$(GT_PROOF_GENERATORS)
+endif # WANT_ALT_ORTH_PROOFTOOLS
+
 # Define temporary variables to build final target filenames from:
-BASENAME_ANALYSERS_ORTH=$(sort $(basename $(GT_ANALYSERS)))
+BASENAME_ANALYSERS_ORTH=$(sort $(basename $(GT_ANALYSERS) $(ALT_ORTH_PROOF_ANALYSERS)))
 ALT_ORTH_ANALYSERS_TMP=$(shell for ll in $(BASENAME_ANALYSERS_ORTH); do\
     for ld in $(ALT_ORTHS); do\
         echo "$$ll.$$ld" ;\
     done ;\
 done)
 
-BASENAME_GENERATORS_ORTH=$(sort $(basename $(GT_GENERATORS)))
+BASENAME_GENERATORS_ORTH=$(sort $(basename $(GT_GENERATORS) $(ALT_ORTH_PROOF_GENERATORS)))
 ALT_ORTH_GENERATORS_TMP=$(shell for ll in $(BASENAME_GENERATORS_ORTH); do\
     for ld in $(ALT_ORTHS); do\
         echo "$$ll.$$ld" ;\

am-shared/src_gramcheck-include.am

@@ -6,8 +6,8 @@ if CAN_HFST
 
 if WANT_GRAMCHECK
 
-GT_ANALYSERS += analyser-gramcheck-gt-desc.hfstol
-GT_GENERATORS+=generator-gramcheck-gt-norm.hfstol
+GT_PROOF_ANALYSERS = analyser-gramcheck-gt-desc.hfstol
+GT_PROOF_GENERATORS=generator-gramcheck-gt-norm.hfstol
 
 endif # WANT_GRAMCHECK
 

configure.ac

@@ -14,7 +14,7 @@
 
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([giella-core], [1.1.1], [feedback@divvun.no], [giella-core], [https://github.com/giellalt/giella-core])
+AC_INIT([giella-core], [1.1.2], [feedback@divvun.no], [giella-core], [https://github.com/giellalt/giella-core])
 AC_REVISION([$Revision$])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.9 tar-pax -Wall -Werror foreign])