APPROVE COMMIT 21.5
Note reply-to: xemacs-patches.
Raymond Toy writes:
Did I update my tree incorrectly?
No, it appears I did. (Have I mentioned recently that it was a really
big mistake to use any VCS besides git?)
Thanks for following up so patiently!
I can't think of an equivalent plain sed version, but I could
probably
come with something using expr.
It's easy enough to do a plain sed version. Patch attached. Lightly
tested (known to succeed with makeinfo 4.13 on my system, and fail
with appropriate warning for makeinfo 4.8 with 4.13 mv'ed away
temporarily).
Steve
diff -r 52b9fe8f44c0 ChangeLog
--- a/ChangeLog Wed Jul 10 14:32:02 2013 +0100
+++ b/ChangeLog Sun Jul 28 02:41:25 2013 +0900
@@ -1,3 +1,9 @@
+2013-07-28 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * configure.ac (makeinfo):
+ Use basic regexp. Avoid autoconf errors on empty version strings.
+ Report version found if insufficient. Lightly tested.
+
2013-06-25 Jerry James <james(a)xemacs.org>
* INSTALL: Update required makeinfo version.
diff -r 52b9fe8f44c0 configure
--- a/configure Wed Jul 10 14:32:02 2013 +0100
+++ b/configure Sun Jul 28 02:41:25 2013 +0900
@@ -10564,10 +10564,10 @@
$as_echo_n "checking for makeinfo >= 4.12... " >&6; }
MAKEINFO=
for prog in `which -a makeinfo`; do
- mi_verstr=`$prog --version | sed -rn '1s/.*+[[:blank:]]([^[:blank:]]+)$/\1/p'`
+ mi_verstr=`$prog --version | sed -n '1s/^.*
\([0-9][0-9]*\.[0-9][0-9]*\)$/\1/p'`
mi_major=`echo $mi_verstr | cut -d. -f1`
mi_minor=`echo $mi_verstr | cut -d. -f2`
- if test $mi_major -gt 4 || ( test $mi_major -eq 4 && test $mi_minor -gt 11 );
+ if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 &&
test "$mi_minor" -gt 11 );
then
MAKEINFO=$prog
break
@@ -10576,8 +10576,8 @@
if test -z $MAKEINFO; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Makeinfo 4.12 or later required
to build info files." >&5
-$as_echo "$as_me: WARNING: Makeinfo 4.12 or later required to build info
files." >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found Makeinfo $mi_verstr. 4.12
or later required." >&5
+$as_echo "$as_me: WARNING: Found Makeinfo $mi_verstr. 4.12 or later required."
>&2;}
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
diff -r 52b9fe8f44c0 configure.ac
--- a/configure.ac Wed Jul 10 14:32:02 2013 +0100
+++ b/configure.ac Sun Jul 28 02:41:25 2013 +0900
@@ -2590,10 +2590,10 @@
AC_MSG_CHECKING([for makeinfo >= 4.12])
MAKEINFO=
for prog in `which -a makeinfo`; do
- mi_verstr=[`$prog --version | sed -rn
'1s/.*+[[:blank:]]([^[:blank:]]+)$/\1/p'`]
+ mi_verstr=[`$prog --version | sed -n '1s/^.*
\([0-9][0-9]*\.[0-9][0-9]*\)$/\1/p'`]
mi_major=`echo $mi_verstr | cut -d. -f1`
mi_minor=`echo $mi_verstr | cut -d. -f2`
- if test $mi_major -gt 4 || ( test $mi_major -eq 4 && test $mi_minor -gt 11 );
+ if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 &&
test "$mi_minor" -gt 11 );
then
MAKEINFO=$prog
break
@@ -2601,7 +2601,7 @@
done
if test -z $MAKEINFO; then
AC_MSG_RESULT([no])
- AC_MSG_WARN([Makeinfo 4.12 or later required to build info files.])
+ AC_MSG_WARN([Found Makeinfo $mi_verstr. 4.12 or later required.])
else
AC_MSG_RESULT([yes])
fi
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches