groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 23/26: [m4]: Fix Savannah #66438 (macOS config failure).


From: G. Branden Robinson
Subject: [groff] 23/26: [m4]: Fix Savannah #66438 (macOS config failure).
Date: Thu, 14 Nov 2024 11:54:12 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit de7e0a2e75db20bf28a7641a56cb140a55ce3948
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Nov 14 09:50:13 2024 -0600

    [m4]: Fix Savannah #66438 (macOS config failure).
    
    * m4/groff.m4 (GROFF_CHECK_VERSION_FORMAT): Use a _basic_ (not extended)
      regular expression as the pattern operand to expr(1)'s `:` operator.
      Should fix configuration failure on macOS.
    
    Fixes <https://savannah.gnu.org/bugs/?66438>.  Thanks to Sven Schober
    for the report.
---
 ChangeLog   | 9 +++++++++
 m4/groff.m4 | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 657e0e49f..88a158ce1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-11-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m4/groff.m4 (GROFF_CHECK_VERSION_FORMAT): Use a _basic_ (not
+       extended) regular expression as the pattern operand to expr(1)'s
+       `:` operator.  Should fix configuration failure on macOS.
+
+       Fixes <https://savannah.gnu.org/bugs/?66438>.  Thanks to Sven
+       Schober for the report.
+
 2024-11-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/roff/troff/input.cpp (interpolate_macro, lookup_request):
diff --git a/m4/groff.m4 b/m4/groff.m4
index e37b0d005..6ee813ff3 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -34,7 +34,8 @@ AC_DEFUN([GROFF_CHECK_VERSION_FORMAT], [
   AC_REQUIRE([GROFF_MAKE_SHORT_VERSION])
   groff_version_format_validity=invalid
   AC_MSG_CHECKING([checking that groff version string has valid format])
-  if expr "$SHORT_VERSION" : '[[0-9]]\+\.[[0-9]]\+\.[[0-9]]\+' \
+  if expr "$SHORT_VERSION" : \
+      '[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.[[0-9]][[0-9]]*' \
     > /dev/null
   then
     groff_version_format_validity=valid



reply via email to

[Prev in Thread] Current Thread [Next in Thread]