-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)
+if test x"$with_gui" != x"no" ; then
+ 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 >= 2.6.0,,
+ [PSPP_REQUIRED_PREREQ([libglade 2.0 (or use --without-gui)])])
+fi
+AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
+
+
+dnl Checks needed for psql reader
+AC_CHECK_PROG(psql_support, pg_config, yes, no)
+if test x"$psql_support" = x"yes" ; then
+ AC_DEFINE([PSQL_SUPPORT], 1,
+ [Define to 1 if building in support for reading from postgres databases.])
+ PG_CFLAGS=-I`pg_config --includedir`
+ AC_SUBST(PG_CFLAGS)
+ PG_LDFLAGS=-L`pg_config --libdir`
+ AC_SUBST(PG_LDFLAGS)
+ PG_LIBS=-lpq
+ AC_SUBST(PG_LIBS)
+ PKG_CHECK_MODULES(OPENSSL,libssl,
+ AC_DEFINE([USE_SSL],1,
+ [Define to 1 if the openssl library is present.])
+ ,)
+fi
+AM_CONDITIONAL(PSQL_SUPPORT, test x"$psql_support" = x"yes")
+
+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")