src/ui/gui/main.c: Add a startup tip for Windows

[pspp] / acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
index 14f746effa78da7462eef88f712011374a7131f8..5e393144f4f08cc18dc2d966772b4fae6b2083a8 100644 (file)
--- 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
@@ -355,15 +356,20 @@ AC_DEFUN([PSPP_CHECK_DOT],
 
 
 dnl Check that xgettext is sufficiently recent
-dnl Before calling this function the variable XGETTEXT must point to the xgettext binary
+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'`
-    major=${ver%%.[[0-9]][[0-9]]*}
-    majmin=${ver%.[[0-9]][[0-9]]*}
-    minor=${majmin##[0-9]*.}
+    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
@@ -371,4 +377,3 @@ AC_DEFUN([PSPP_CHECK_XGETTEXT],
     else
       pspp_cv_progrecent_xgettext=yes
     fi])])
-