X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=844e8269f20126050fc263a470513d623ce5ff3d;hb=a94d5054363ca725a6810780b3621f064956929a;hp=57e7ae8a16cf7d6c5237a4700eee99d83d13ece1;hpb=58c47d4adc7f01f7fb82219cc73bd96dee837fdb;p=pspp-builds.git

diff --git a/configure.ac b/configure.ac
index 57e7ae8a..844e8269 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 AX_PREREQ(2.60)
-AC_INIT(pspp, 0.4.3,bug-gnu-pspp@gnu.org)
+AC_INIT([pspp],[0.4.3],[bug-gnu-pspp@gnu.org])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE
 
@@ -39,8 +39,8 @@ AC_ARG_WITH(
   [AS_HELP_STRING([--without-gui], [don't build the PSPPIRE gui])])
 
 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(GTK, gtk+-2.0 >= 2.12.0,,
+    [PSPP_REQUIRED_PREREQ([gtk+ 2.0 v2.12.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
@@ -48,6 +48,22 @@ 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 
@@ -56,8 +72,12 @@ if test -n "$PG_CONFIG" ; then
    [Define to 1 if building in support for reading from postgres databases.])
    PG_CFLAGS=-I`$PG_CONFIG --includedir` 
    AC_SUBST(PG_CFLAGS)
-   PG_LDFLAGS=-R`$PG_CONFIG --libdir`
+   
+   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,