X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=708911ed6cbf00d9536fecff27b6a25726035c04;hb=bda57108154cc05a58915933d9c24e609ee08710;hp=4fa093d71f8ce57133bf453fd0da87811fb12b9b;hpb=c13375ebe886fc3ed5ce70a260bb2b01cebb4b1f;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 4fa093d7..708911ed 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)
 
@@ -46,10 +47,50 @@ fi
 AM_CONDITIONAL(WITHGUI, test x"$with_gui" != x"no")
 
 
+dnl Checks needed for psql reader
+
+dnl The 8.x series postgres tarballs installs with a default prefix of
+dnl /usr/local/pgsql whereas, OSes (such as debian)  install into /usr .
+
+dnl If the libpq.so file is in a non standard path, (one which the linker
+dnl doesn't search) then we must set the PG_LDFLAGS to -R/usr/wherever/
+dnl However, if the system happens to have more than one version of other
+dnl dependent libraries (eg. libgtk) in different standard paths. (eg:
+dnl /usr and /usr/local) then the wrong one may get linked. 
+
+dnl To overcome this, we first check for libpq in the standard places, and
+dnl only set PG_LDFLAGS if it's not found.
+
+
+AC_CHECK_LIB([pq], [PQexec], [libpq_in_std_lib_path=yes])
+
+AC_ARG_VAR([PG_CONFIG], [Full pathname of the pg_config program shipped with Postgresql])
+AC_PATH_PROG([PG_CONFIG], [pg_config], [], [$PATH:/usr/local/pgsql/bin:/usr/pgsql/bin])
+if test -n "$PG_CONFIG" ; then 
+   AC_SUBST(PG_CONFIG)
+   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)
+   
+   if test "x$libpq_in_std_lib_path" != x"yes" ; then
+      PG_LDFLAGS="-L`$PG_CONFIG --libdir` -R`$PG_CONFIG --libdir`"
+   fi
+   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 -n "$PG_CONFIG")
+
 dnl Checks needed for gnumeric reader
 gnm_support=yes;
 PKG_CHECK_MODULES(LIBXML2, libxml-2.0,,
-			   [PSPP_OPTIONAL_PREREQ([libxml2]); gnm_support=no]);
+			   [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;])
 
@@ -57,6 +98,7 @@ 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,
@@ -82,11 +124,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
 
@@ -94,9 +132,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],