-dnl Check that off_t is defined as an integer type.
-dnl Solaris sometimes declares it as a struct, if it
-dnl thinks that the compiler does not support `long long'.
-AC_COMPILE_IFELSE([#include <sys/types.h>
-#include <unistd.h>
-off_t x = 0;
-int main (void)
-{
- lseek (0, 1, 2);
- return 0;
-}], [], [AC_MSG_ERROR(
-[Your system's definition of off_t is broken. You are probably
-using Solaris. You can probably fix the problem with
-`--disable-largefile' or `CFLAGS=-ansi'.])])
-
-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]))
+dnl Checks needed for gnumeric reader
+gnm_support=yes;
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0,,
+ [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no;]);
+AC_SEARCH_LIBS(gzopen,z,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
+AC_CHECK_HEADERS(zlib.h,,[PSPP_OPTIONAL_PREREQ([zlib]); gnm_support=no;])
+
+if test x"$gnm_support" = x"yes" ; then
+ AC_DEFINE([GNM_SUPPORT], 1,
+ [Define to 1 if building in support for reading Gnumeric files.])
+fi
+AM_CONDITIONAL(GNM_SUPPORT, test x"$gnm_support" = x"yes")
+
+AC_ARG_WITH(
+ gui_tools,
+ [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools])])
+if test x"$with_gui_tools" = x"yes" ; then
+ PKG_CHECK_MODULES(GLADE_UI, gladeui-1.0)
+fi
+AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes")
+
+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)])])