Merge tag 'orig/1.7.2.1' into winport

Version v1.7.2 r1

* Modify template forward declaration of NoMatchComposeFilter in
  fst/fst-decl.h:249 to match type metavariable names with the
  template definition (MSVC idiosyncrasy).
* Resolve trivial conflict in lib/mapped-file.cc.
* Bump library version to 16 in CMakefiles to match Makefile.am.

CMakeLists.txt

@@ -7,7 +7,7 @@ if (ICU_FOUND)
 endif (ICU_FOUND)
 
 find_package(ZLIB)
-if (ZLIB_FOUND) 
+if (ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIRECTORIES})
   set(ZLIBS ${ZLIB_LIBRARIES})
 endif (ZLIB_FOUND)
@@ -27,9 +27,9 @@ else()
   option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 endif (WIN32)
 
-set(SOVERSION "10")
-OPTION(BUILD_USE_SOLUTION_FOLDERS "Enable grouping of projects in VS" ON) 
-SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ${BUILD_USE_SOLUTION_FOLDERS}) 
+set(SOVERSION "16")
+OPTION(BUILD_USE_SOLUTION_FOLDERS "Enable grouping of projects in VS" ON)
+SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ${BUILD_USE_SOLUTION_FOLDERS})
 
 
 option(HAVE_BIN          "Build the fst binaries" ON)

Makefile.am

@@ -1,2 +1,4 @@
 SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = BUILD.bazel

Makefile.in

@@ -345,6 +345,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src
 ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = BUILD.bazel
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

NEWS

@@ -1,4 +1,10 @@
 OpenFst: Release 1.7
+   * Fixes bug with coinaccessible states in NaturalAStarEstimate (1.7.2)
+   * Optionally allows building with Bazel (1.7.2)
+   * Simplifies string printing interface (1.7.2)
+   * Marks weight converters const (1.7.2)
+   * Adds NoMatchComposeFilter (1.7.2)
+   * Removed static assertions that trigger bugs in GCC (1.7.1)
    * Evaluates many weight operations at compile-time (1.7.1)
    * Adds configure-time test for float equality reflexivity (1.7.0)
    * Adds additional overloads to Equals (1.7.0)

README

@@ -1,10 +1,10 @@
-OpenFst: Release 1.7.1.
+OpenFst: Release 1.7.2.
 
 OpenFst is a library for constructing, combining, optimizing, and searching
 weighted finite-state transducers (FSTs).
 
 REQUIREMENTS:
-  This version is known to work under Linux using g++ (>= 4.7) and OS X using
+  This version is known to work under Linux using g++ (>= 4.9) and OS X using
   XCode (>= 5). It is expected to work wherever adequate POSIX (dlopen,
   ssize_t, basename), C99 (snprintf, strtoll, <stdint.h>), and C++11
   (<unordered_set>, <unordered_map>, <forward_list>) support is available.
@@ -61,6 +61,19 @@ USAGE:
   correctly if desired. Any extensions will be found under /usr/local/lib/fst
   or /usr/local/include/fst/extensions.
 
+BUILDING WITH BAZEL:
+  As of release 1.7.2 it is possible to build the core library and binaries as
+  well as several extensions with Bazel and to depend on OpenFst as an
+  external dependency in other projects compiled with Bazel. Please refer to
+  https://bazel.build for information on using Bazel. OpenFst can be compiled
+  from anywhere in the source tree, as follows:
+
+  $ bazel build //:all
+
+  Tests can be run in a similar fashion:
+
+  $ bazel test //:all
+
 DOCUMENTATION:
   See www.openfst.org for general documentation.
   See ./NEWS for updates since the last release.