diff options
| author | Adrian Thurston <thurston@colm.net> | 2021-02-15 11:46:09 -0800 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2021-02-15 11:47:05 -0800 |
| commit | 672ece03a8dbbba77205162aac36aa64932905bc (patch) | |
| tree | 2a98bf488c6c20d138bffa004a1a965e72d9a37f | |
| parent | d32f70da992931d1f0a0be73351a8b5e9e76444f (diff) | |
| download | ragel-672ece03a8dbbba77205162aac36aa64932905bc.tar.gz | |
version bump to 7.0.4
Moved make of src/include/ragel to configure script. Expect colm 0.14.7.
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 92fb7552..6b3a5b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM dnl OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE dnl SOFTWARE. -AC_INIT(ragel, 7.0.3) -PUBDATE="January 2021" +AC_INIT(ragel, 7.0.4) +PUBDATE="February 2021" AM_INIT_AUTOMAKE([foreign]) @@ -65,7 +65,7 @@ AC_SUBST(COLM_SHARE) AC_SUBST(LIBCOLM_LA) AC_SUBST(LIBFSM_LA) -EXPECTED_COLM_VER=0.14.6 +EXPECTED_COLM_VER=0.14.7 INSTALLED_COLM_VER=`$COLM -v | sed -n -e '1 {' -e 's/^.*version //' -e 's/ .*$//' -e p -e '}'` if test "x$INSTALLED_COLM_VER" != "x$EXPECTED_COLM_VER"; then AC_ERROR( [check colm: expected version $EXPECTED_COLM_VER, but $INSTALLED_COLM_VER is installed] ) @@ -426,6 +426,9 @@ AC_SUBST(EXTERNAL_COLM) AC_SUBST(EXTERNAL_INC) AC_SUBST(EXTERNAL_LIBS) +mkdir -p src/include +test -e src/include/ragel || ln -s .. src/include/ragel + dnl dnl Wrap up. dnl diff --git a/src/Makefile.am b/src/Makefile.am index 8b7bf2bd..c4fe531c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,12 +43,7 @@ ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la BUILT_SOURCES = \ version.h \ - parse.c rlreduce.cc \ - include/ragel - -include/ragel: - mkdir -p include - ln -s .. include/ragel + parse.c rlreduce.cc if WITH_RAGEL_KELBT nodist_ragel_SOURCES += \ |