dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
-AX_PREREQ(2.57)
-AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
+AX_PREREQ(2.60)
+AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org)
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_GNU_SOURCE
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
-PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
+PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
-
+PSPP_CC_FOR_BUILD
PSPP_PERL
dnl Internationalization macros.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
dnl Checks for libraries.
AC_SYS_LARGEFILE
AC_FUNC_FSEEKO
AC_CHECK_LIB(m, sin)
PSPP_LIBPLOT
+PSPP_LC_PAPER
AM_CONDITIONAL(WITHCHARTS, test x"$with_libplot" != x"no")
AC_ARG_WITH(gui, [ --without-gui don't build the PSPPIRE gui])
if test x"$with_gui" != x"no" ; then
- PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0)
- PKG_CHECK_MODULES(GLADE, libglade-2.0)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.8.0,,
+ [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.8.0 or later (or use --without-gui)])])
+ PKG_CHECK_MODULES(GLADE, libglade-2.0,,
+ [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
fi
AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
AC_ARG_WITH(gui_tools, [ --with-gui-tools build the gui developer tools])
if test x"$with_gui_tools" = x"yes" ; then
- PKG_CHECK_MODULES(GLADE_UI, libgladeui-1.0)
+ PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
fi
AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
AC_C_BIGENDIAN
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept popen round trunc])
+AC_CHECK_FUNCS([__setfpucw execl fork isinf isnan finite getpid feholdexcept fpsetmask popen round trunc])
AC_PROG_LN_S
PSPP_CHECK_PREREQS
-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
AC_OUTPUT