diff options
| author | Adrian Thurston <thurston@colm.net> | 2019-09-12 12:46:39 -0600 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2019-09-12 12:46:39 -0600 |
| commit | b594d15ae9d3a6c7451273949f5186e169e4dcba (patch) | |
| tree | 0927a602b67bd6748a76539a94f45c0ed394812e | |
| parent | 0be7246032e1a8c7e53e5314ef075daa4ebc084f (diff) | |
| download | colm-b594d15ae9d3a6c7451273949f5186e169e4dcba.tar.gz | |
use the correct version for the ragel program
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | ragel/Makefile.am | 4 | ||||
| -rw-r--r-- | ragel/inputdata.cc | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 79bf14ad..c1f4eb62 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,6 @@ PUBDATE="May 2019" RAGEL_VERSION="7.0.0.12" RAGEL_PUBDATE="May 2019" - AM_INIT_AUTOMAKE([foreign]) : ${CFLAGS="-Wall -g"} @@ -35,6 +34,8 @@ AM_INIT_AUTOMAKE([foreign]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST(PUBDATE) +AC_SUBST(RAGEL_VERSION) +AC_SUBST(RAGEL_PUBDATE) AC_CHECK_SIZEOF([int]) AC_CHECK_SIZEOF([long]) AC_CHECK_SIZEOF([void *]) diff --git a/ragel/Makefile.am b/ragel/Makefile.am index bc836591..b16a0397 100644 --- a/ragel/Makefile.am +++ b/ragel/Makefile.am @@ -105,8 +105,8 @@ BUILT_SOURCES += \ endif version.h: Makefile - echo '#define VERSION "$(PACKAGE_VERSION)"' > version.h - echo '#define PUBDATE "$(PUBDATE)"' >> version.h + echo '#define RAGEL_VERSION "@RAGEL_VERSION@"' > version.h + echo '#define RAGEL_PUBDATE "@RAGEL_PUBDATE@"' >> version.h EXTRA_DIST = \ $(RAGEL_LM) \ diff --git a/ragel/inputdata.cc b/ragel/inputdata.cc index cfe51a94..6b689ae4 100644 --- a/ragel/inputdata.cc +++ b/ragel/inputdata.cc @@ -640,8 +640,8 @@ void InputData::usage() /* Print version information and exit. */ void InputData::version() { - info() << "Ragel State Machine Compiler version " VERSION << " " PUBDATE << endl << - "Copyright (c) 2001-2019 by Adrian Thurston" << endl; + info() << "Ragel State Machine Compiler version " RAGEL_VERSION << " " RAGEL_PUBDATE << endl << + "Copyright (c) 2001-2019 by Adrian Thurston et al." << endl; abortCompile( 0 ); } |