-dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2006, 2007, 2009 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.
if test "$PERL" != no && $PERL -e 'require 5.005_03;'; then :; else
PSPP_REQUIRED_PREREQ([Perl 5.005_03 (or later)])
fi
-])
-
-dnl Check that libplot is available.
-AC_DEFUN([PSPP_LIBPLOT],
-[
- AC_ARG_WITH(
- libplot,
- [AS_HELP_STRING([--without-libplot],
- [don't compile in support of charts (using libplot)])])
-
- if test x"$with_libplot" != x"no" ; then
- # Check whether we can link against libplot without any extra libraries.
- AC_CHECK_LIB(plot, pl_newpl_r, [LIBPLOT_LIBS="-lplot"])
-
- # Check whether we can link against libplot if we also link X.
- if test x"$LIBPLOT_LIBS" = x""; then
- AC_PATH_XTRA
- extra_libs="-lXaw -lXmu -lXt $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm"
- AC_CHECK_LIB(plot, pl_newpl_r,
- [LIBPLOT_LIBS="-lplot $extra_libs"
- LDFLAGS="$LDFLAGS $X_LIBS"],,
- [$extra_libs])
- fi
- # Still can't link?
- if test x"$LIBPLOT_LIBS" = x""; then
- PSPP_REQUIRED_PREREQ([libplot (or use --without-libplot)])
- fi
-
- # Set up to make everything work.
- LIBS="$LIBPLOT_LIBS $LIBS"
- AC_DEFINE(HAVE_LIBPLOT, 1,
- [Define to 1 if you have the `libplot' library (-lplot).])
- fi
+ # The PSPP autobuilder appends a build number to the PSPP version number,
+ # e.g. "0.7.2-build40". But Perl won't parse version numbers that contain
+ # anything other than digits and periods, so "-build" causes an error. So we
+ # define $(VERSION_FOR_PERL) that drops everything from the hyphen onward.
+ VERSION_FOR_PERL=`echo "$VERSION" | sed 's/-.*//'`
+ AC_SUBST([VERSION_FOR_PERL])
])
dnl PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED])
CFLAGS="$CFLAGS -fgnu89-inline"
fi])
])
-dnl acinclude.m4 ends here
+
+AC_DEFUN([PSPP_CHECK_CLICKSEQUENCE],
+ [AC_REQUIRE([AM_INIT_AUTOMAKE]) # Defines MAKEINFO
+ AC_CACHE_CHECK([whether makeinfo supports @clicksequence],
+ [pspp_cv_have_clicksequence],
+ [cat > conftest.texi <<EOF
+@setfilename conftest.info
+@clicksequence{File @click{} Open}
+EOF
+ echo "configure:__oline__: running $MAKEINFO conftest.texi >&AS_MESSAGE_LOG_FD" >&AS_MESSAGE_LOG_FD
+ eval "$MAKEINFO conftest.texi >&AS_MESSAGE_LOG_FD 2>&1"
+ retval=$?
+ echo "configure:__oline__: \$? = $retval" >&AS_MESSAGE_LOG_FD
+ if test $retval = 0; then
+ pspp_cv_have_clicksequence=yes
+ else
+ pspp_cv_have_clicksequence=no
+ 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])
+ fi])