dnl Initialize.
AX_PREREQ(2.57)
-AC_INIT(pspp, 0.4.1,bug-gnu-pspp@gnu.org)
+AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE(1.9)
dnl Checks for programs.
AC_GNU_SOURCE
+gl_EARLY
AC_PROG_CC
AM_PROG_CC_C_O
-AC_PROG_RANLIB
-gl_EARLY
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
PSPP_ENABLE_WARNING(-Wdeclaration-after-statement)
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)
+fi
+AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" == x"yes")
+
PSPP_OFF_T
-AC_CHECK_LIB(gslcblas,main,,AC_MSG_ERROR([You must install libgslcblas development libraries]))
-AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,
- AC_MSG_ERROR([You must install development libraries for libgsl version 1.4 or later]))
+AC_CHECK_LIB(gslcblas,main,,[PSPP_REQUIRED_PREREQ([libgslcblas])])
+AC_CHECK_LIB(gsl, gsl_cdf_chisq_Q,,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])])
AC_CHECK_LIB(ncurses, tgetent)
AC_CHECK_HEADERS(termcap.h)
dnl Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
AC_CHECK_TYPES(off_t)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
AC_CHECK_SIZEOF(float, 0)
AC_CHECK_SIZEOF(double, 8)
AC_CHECK_SIZEOF(long double, 0)
AC_C_BIGENDIAN
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([strchr strrchr __setfpucw isinf isnan finite getpid feholdexcept])
+AC_CHECK_FUNCS([__setfpucw isinf isnan finite getpid feholdexcept round trunc])
AC_PROG_LN_S
AC_DEFINE(DEBUGGING, 1, [Define to 1 if debugging is enabled.])
fi
+PSPP_CHECK_PREREQS
+
AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
AC_OUTPUT