X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=9c52b30a676ef3c77393bb174dc61b74538e6ab5;hb=da333d7456a56655ebf4ce0e16e6cf468ab1c1af;hp=f738c50b49f46d35c3210068ff7f177abd5c1d12;hpb=49622888cd4954bf11544b2e43f58e523c9954b5;p=pspp

diff --git a/configure.ac b/configure.ac
index f738c50b49..9c52b30a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ gl_EARLY
 AM_PROG_CC_C_O
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
 
 PSPP_ENABLE_OPTION(-Wdeclaration-after-statement)
 
@@ -45,6 +46,38 @@ if test x"$with_gui" != x"no" ; then
 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")
+
 AC_ARG_WITH(
   gui_tools,
   [AS_HELP_STRING([--with-gui-tools], [build the gui developer tools])])
@@ -69,11 +102,7 @@ gl_INIT
 
 AC_C_INLINE
 
-dnl  Dont use AC_TYPE_OFF_T --- it doesnt generate the HAVE_TYPE macro
-AC_CHECK_TYPES(off_t) 
-AC_CHECK_SIZEOF(float)
 AC_CHECK_SIZEOF(double)
-AC_CHECK_SIZEOF(long double)
 
 AC_C_BIGENDIAN
 
@@ -81,9 +110,6 @@ AC_CHECK_FUNCS([__setfpucw fork execl execlp isinf isnan finite getpid feholdexc
 
 AC_PROG_LN_S
 
-dnl This is needed otherwise --with-included-gettext fails
-AH_BOTTOM([#include <locale.h>])
-
 AC_ARG_ENABLE(
   debug, 
   [AS_HELP_STRING([--enable-debug],