[automake-commit] 01/02: m4: update invocation of AC_PROG_LEX.

[Karl Berry]

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=edd083968cdc766247c4147854d2f82025cd6c4a

commit edd083968cdc766247c4147854d2f82025cd6c4a
Author: Łukasz Stelmach <stlman@poczta.fm>
AuthorDate: Wed Nov 1 09:18:57 2023 -0700

    m4: update invocation of AC_PROG_LEX.
    
    * m4/lex.m4: Pass on any arguments given to AC_PROG_LEX.
    * doc/automake.texi: Describe this.
    * NEWS: Mention this.
    * THANKS: New contributor.
---
 NEWS              | 2 ++
 THANKS            | 1 +
 doc/automake.texi | 5 +++--
 m4/lex.m4         | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index db2975449..ed034b7cc 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,8 @@ New in 1.17:
 
   - tests: avoid some declaration conflicts for lex et al. on SunOS.
 
+  - Pass any options given to AM_PROG_LEX on to AC_PROG_LEX.
+
 * Obsolescent features:
 
   - py-compile no longer supports Python 0.x or 1.x versions.  Python 2.0,
diff --git a/THANKS b/THANKS
index 1217d3c2a..63e4f65af 100644
--- a/THANKS
+++ b/THANKS
@@ -249,6 +249,7 @@ Libor Bukata                    libor.bukata@oracle.com
 Loulou Pouchet                  loulou@lrde.epita.fr
 Ludovic Courtès                 ludo@gnu.org
 Lukas Fleischer                 lfleischer@lfos.de
+Łukasz Stelmach              stlman@poczta.fm
 Luo Yi                          luoyi.ly@gmail.com
 Maciej Stachowiak               mstachow@mit.edu
 Maciej W. Rozycki               macro@ds2.pg.gda.pl
diff --git a/doc/automake.texi b/doc/automake.texi
index 60a516fea..7691ecf07 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -4130,7 +4130,7 @@ Automake 1.14, the @code{AC_PROG_CC} is rewritten to 
implement such
 checks itself, and thus the explicit use of @code{AM_PROG_CC_C_O}
 should no longer be required.
 
-@item AM_PROG_LEX
+@item AM_PROG_LEX([@var{options}])
 @acindex AM_PROG_LEX
 @acindex AC_PROG_LEX
 @cindex HP-UX 10, @command{lex} problems
@@ -4138,7 +4138,8 @@ should no longer be required.
 Like @code{AC_PROG_LEX} (@pxref{Particular Programs, , Particular
 Program Checks, autoconf, The Autoconf Manual}), but uses the
 @command{missing} script on systems that do not have @command{lex}.
-HP-UX 10 is one such system.
+HP-UX 10 is one such system. @var{options} are passed directly to
+@code{AC_PROG_LEX}.
 
 @item AM_PROG_GCJ
 @acindex AM_PROG_GCJ
diff --git a/m4/lex.m4 b/m4/lex.m4
index 7b0511526..8830113d7 100644
--- a/m4/lex.m4
+++ b/m4/lex.m4
@@ -6,14 +6,14 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# AM_PROG_LEX
-# -----------
+# AM_PROG_LEX([OPTIONS])
+# --------------------
 # Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
 # "missing" invocation, for better error output.
 AC_DEFUN([AM_PROG_LEX],
 [AC_PREREQ([2.50])dnl
 AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
+AC_PROVIDE_IFELSE([AC_PROG_LEX], [], [AC_PROG_LEX($@)])dnl
 if test "$LEX" = :; then
   LEX=${am_missing_run}flex
 fi])