<div dir="ltr">Merged in master and stable-1.2.<div><br></div><div>Thanks!</div><div>Jérémie</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jul 10, 2015 at 11:36 AM, Jonathan Rajotte <span dir="ltr"><<a href="mailto:jonathan.rajotte-julien@efficios.com" target="_blank">jonathan.rajotte-julien@efficios.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Officials m4 were merged in [1][2].<br>
<br>
[1] <a href="https://github.com/peti/autoconf-archive/commit/b2bdd8591b2d6b1eb580ead5f978a30e3ecfc36c" rel="noreferrer" target="_blank">https://github.com/peti/autoconf-archive/commit/b2bdd8591b2d6b1eb580ead5f978a30e3ecfc36c</a><br>
[2] <a href="https://github.com/peti/autoconf-archive/commit/fd1f2862c1524e73495d67646d26000e2e85e807" rel="noreferrer" target="_blank">https://github.com/peti/autoconf-archive/commit/fd1f2862c1524e73495d67646d26000e2e85e807</a><br>
<br>
Signed-off-by: Jonathan Rajotte <<a href="mailto:jonathan.rajotte-julien@efficios.com">jonathan.rajotte-julien@efficios.com</a>><br>
---<br>
m4/ax_prog_bison_version.m4 | 21 +++++++++++++--------<br>
m4/ax_prog_flex_version.m4 | 19 ++++++++++++-------<br>
2 files changed, 25 insertions(+), 15 deletions(-)<br>
<br>
diff --git a/m4/ax_prog_bison_version.m4 b/m4/ax_prog_bison_version.m4<br>
index 6b95585..5da478c 100644<br>
--- a/m4/ax_prog_bison_version.m4<br>
+++ b/m4/ax_prog_bison_version.m4<br>
@@ -1,22 +1,27 @@<br>
+# ===========================================================================<br>
+# <a href="http://www.gnu.org/software/autoconf-archive/ax_prog_bison_version.html" rel="noreferrer" target="_blank">http://www.gnu.org/software/autoconf-archive/ax_prog_bison_version.html</a><br>
+# ===========================================================================<br>
+#<br>
# SYNOPSIS<br>
#<br>
# AX_PROG_BISON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])<br>
#<br>
# DESCRIPTION<br>
#<br>
-# Makes sure that bison version is greater or equal to the version indicated.<br>
-# If true the shell commands in ACTION-IF-TRUE are executed. If not the shell<br>
-# commands in commands in ACTION-IF-TRUE are executed. If not the shell<br>
-# commands in ACTION-IF-FALSE are run. Note if $BISON is not set (for example<br>
-# by running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail.<br>
+# Makes sure that bison version is greater or equal to the version<br>
+# indicated. If true the shell commands in ACTION-IF-TRUE are executed. If<br>
+# not the shell commands in commands in ACTION-IF-TRUE are executed. If<br>
+# not the shell commands in ACTION-IF-FALSE are run. Note if $BISON is not<br>
+# set (for example by running AC_CHECK_PROG or AC_PATH_PROG) the macro<br>
+# will fail.<br>
#<br>
# Example:<br>
#<br>
# AC_PATH_PROG([BISON],[bison])<br>
# AX_PROG_BISON_VERSION([3.0.2],[ ... ],[ ... ])<br>
#<br>
-# This will check to make sure that the bison you have is at least<br>
-# version 3.0.2 or greater.<br>
+# This will check to make sure that the bison you have is at least version<br>
+# 3.0.2 or greater.<br>
#<br>
# NOTE: This macro uses the $BISON variable to perform the check.<br>
#<br>
@@ -29,7 +34,7 @@<br>
# and this notice are preserved. This file is offered as-is, without any<br>
# warranty.<br>
<br>
-#serial 12<br>
+#serial 2<br>
<br>
AC_DEFUN([AX_PROG_BISON_VERSION],[<br>
AC_REQUIRE([AC_PROG_SED])<br>
diff --git a/m4/ax_prog_flex_version.m4 b/m4/ax_prog_flex_version.m4<br>
index f1ad9ef..da60e00 100644<br>
--- a/m4/ax_prog_flex_version.m4<br>
+++ b/m4/ax_prog_flex_version.m4<br>
@@ -1,22 +1,27 @@<br>
+# ===========================================================================<br>
+# <a href="http://www.gnu.org/software/autoconf-archive/ax_prog_flex_version.html" rel="noreferrer" target="_blank">http://www.gnu.org/software/autoconf-archive/ax_prog_flex_version.html</a><br>
+# ===========================================================================<br>
+#<br>
# SYNOPSIS<br>
#<br>
# AX_PROG_FLEX_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE])<br>
#<br>
# DESCRIPTION<br>
#<br>
-# Makes sure that flex version is greater or equal to the version indicated.<br>
-# If true the shell commands in ACTION-IF-TRUE are executed. If not the shell<br>
-# commands in commands in ACTION-IF-TRUE are executed. If not the shell<br>
-# commands in ACTION-IF-FALSE are run. Note if $FLEX is not set (for example<br>
-# by running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail.<br>
+# Makes sure that flex version is greater or equal to the version<br>
+# indicated. If true the shell commands in ACTION-IF-TRUE are executed. If<br>
+# not the shell commands in commands in ACTION-IF-TRUE are executed. If<br>
+# not the shell commands in ACTION-IF-FALSE are run. Note if $FLEX is not<br>
+# set (for example by running AC_CHECK_PROG or AC_PATH_PROG) the macro<br>
+# will fail.<br>
#<br>
# Example:<br>
#<br>
# AC_PATH_PROG([FLEX],[flex])<br>
# AX_PROG_FLEX_VERSION([2.5.39],[ ... ],[ ... ])<br>
#<br>
-# This will check to make sure that the flex you have is at least<br>
-# version 2.5.39 or greater.<br>
+# This will check to make sure that the flex you have is at least version<br>
+# 2.5.39 or greater.<br>
#<br>
# NOTE: This macro uses the $FLEX variable to perform the check.<br>
#<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Jérémie Galarneau<br>EfficiOS Inc.<br><a href="http://www.efficios.com" target="_blank">http://www.efficios.com</a></div>
</div>