X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=acinclude.m4;h=5e393144f4f08cc18dc2d966772b4fae6b2083a8;hb=991b87b671dfda11f4aaae78b059c1450f9c8df1;hp=49bb3b8ed4e7e480ccc647e002e6eecf2e4768e3;hpb=1c5d2755b719a8598eb78a15fc7b090b9a9c7d75;p=pspp

diff --git a/acinclude.m4 b/acinclude.m4
index 49bb3b8ed4..5e393144f4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2009, 2014, 2015, 2021 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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
@@ -352,3 +353,27 @@ AC_DEFUN([PSPP_CHECK_DOT],
        pspp_cv_dot=no
      fi])
    AM_CONDITIONAL([HAVE_DOT], [test "$pspp_cv_dot" = yes])])
+
+
+dnl Check that xgettext is sufficiently recent
+dnl Before calling this macro, AC_CHECK_PROGS([XGETTEXT], [xgettext]) should have been called,
+dnl which sets the ac_cv_prog_XGETTEXT cache variable.
+AC_DEFUN([PSPP_CHECK_XGETTEXT],
+ [AC_CACHE_CHECK([whether gettext is sufficiently recent],
+   [pspp_cv_progrecent_xgettext],
+   [pspp_cv_progrecent_xgettext=maybe
+    ver=`$ac_cv_prog_XGETTEXT --version | sed -n -e '/xgettext/s/[[^0-9]]*\([[0-9\.]][[0-9\.]]*\).*/\1/p'`
+    case $ver in # (
+      *.*.*) ;; # (
+      *.*) ver="$ver.0" ;;
+    esac
+    majmin=`echo $ver | sed -e 's/\.[[0-9]]*$//'`
+    major=`echo $majmin | sed -e 's/\.[[0-9]]*$//'`
+    minor=`echo $majmin | sed -e 's/^[[0-9]]*\.//'`
+    if test "$major" -lt 0; then
+      pspp_cv_progrecent_xgettext=no;
+    elif test "$minor" -lt 20; then
+      pspp_cv_progrecent_xgettext=no
+    else
+      pspp_cv_progrecent_xgettext=yes
+    fi])])