projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CROSSTABS: Reimplement parser without q2c.
[pspp]
/
acinclude.m4
diff --git
a/acinclude.m4
b/acinclude.m4
index 750a87efb19495d35d9cfa454c4cef4acee13b10..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
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
fi])
dnl Texinfo 4.13 generates broken DocBook XML. Probably other old
@@
-362,6
+363,10
@@
AC_DEFUN([PSPP_CHECK_XGETTEXT],
[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'`
[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]]*\.//'`
majmin=`echo $ver | sed -e 's/\.[[0-9]]*$//'`
major=`echo $majmin | sed -e 's/\.[[0-9]]*$//'`
minor=`echo $majmin | sed -e 's/^[[0-9]]*\.//'`