From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 12 Jan 2021 04:38:21 +0000 (-0800)
Subject: configure: Require @clicksequence to be present.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f045a2f12a05da6429cd94e6ac8b7f45e7c95e92;p=pspp

configure: Require @clicksequence to be present.

Occasionally someone tries to build with a really old Texinfo.  It doesn't
work now, although it once did, but before this commit it would
successfully configure.  By preventing configure from finishing, I think
that this will produce a clearer error message earlier in the build
process, ultimately making life easier for users.

Bug #59818.
---

diff --git a/acinclude.m4 b/acinclude.m4
index c657b46e1f..5e393144f4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -276,8 +276,9 @@ EOF
       fi
       rm -f conftest.texi conftest.info])
    if test $pspp_cv_have_clicksequence = no; then
-       AM_MAKEINFOFLAGS="$AM_MAKEINFOFLAGS -DMISSING_CLICKSEQUENCE"
-       AC_SUBST([AM_MAKEINFOFLAGS])
+       AC_MSG_ERROR([$MAKEINFO does not support @clicksequence.
+Please install a newer or working version, or point the MAKEINFO variable
+to one that is already installed.])
    fi])
 
 dnl Texinfo 4.13 generates broken DocBook XML.  Probably other old
diff --git a/doc/pspp.texi b/doc/pspp.texi
index d096a6eab4..e107be4aa1 100644
--- a/doc/pspp.texi
+++ b/doc/pspp.texi
@@ -115,14 +115,6 @@ graphic user interface
 @sc{pspp}
 @end macro
 
-
-@ifset MISSING_CLICKSEQUENCE
-@alias clicksequence = asis
-@macro click {}
-->
-@end macro
-@end ifset
-
 @iftex
 @finalout
 @end iftex