Configure patch

On Thursday 12 June 2003 16:00, Adam H. Pendleton wrote:
> You need to find the directory that houses libpq-fe.h, and then pass the
> parent directory to configure with the --with-pgsql switch.  So if
> libpq-fe.h is in /usr/local/pgsql/include, then you would pass
> --with-pgsql=/usr/local/pgsql to configure (/usr/local/pgsql is one of
> the directories that configure searches, so this is a redundant example).

Max patched the ./configure script to look for pgsql and lipq headers
seperately, as far as I can understand. It adds --with-pgsql-libraries.

Now, pgAdmin3 configures under SuSE 8.2, but we have other problems with
gcc3.3. Could you review this patch and apply it if needed?

Cheers,
Jean-Michel

************************************

Index: acinclude.m4
===================================================================
RCS file: /disk1/cvsroot/pgadmin3/acinclude.m4,v
retrieving revision 1.8
diff -u -r1.8 acinclude.m4
--- acinclude.m4        4 Jun 2003 08:19:25 -0000       1.8
+++ acinclude.m4        12 Jun 2003 14:20:42 -0000
@@ -38,27 +38,27 @@
 [wx_version=2.4])
 ])

-########################################
-# Check for PostgreSQL library (libpq) #
-########################################
+######################################
+# Check for PostgreSQL include files #
+######################################
 AC_DEFUN([CHECK_LIBPQ],
 [AC_MSG_CHECKING(for pgsql)
-AC_ARG_WITH(pgsql,
-[  --with-pgsql=DIR directory to search for pgsql libraries and headers],
+AC_ARG_WITH(pgsql-include,
+[  --with-pgsql-include=DIR directory to search for pgsql libraries and
headers],
 [if test "$withval" != no; then
     AC_MSG_RESULT(yes)
-    LIBPQ_HOME="$withval"
+    LIBPQ_INCLUDE="$withval"
 else
     AC_MSG_RESULT(no)
 fi], [
     AC_MSG_RESULT(yes)
-    LIBPQ_HOME=/usr/local/pgsql
-    if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"
+    LIBPQ_INCLUDE=/usr/local/pgsql/include
+    if test ! -f "${LIBPQ_INCLUDE}/libpq-fe.h"
     then
-        LIBPQ_HOME=/usr/local
-        if test ! -f "${LIBPQ_HOME}/include/libpq-fe.h"
+        LIBPQ_INCLUDE=/usr/local/include
+        if test ! -f "${LIBPQ_INCLUDE}/libpq-fe.h"
         then
-            LIBPQ_HOME=/usr
+            LIBPQ_INCLUDE=/usr/inclde/pgsql
         fi
     fi
 ])
@@ -66,12 +66,11 @@
 #
 # Locate pgsql
 #
-if test -n "${LIBPQ_HOME}"
+if test -n "${LIBPQ_INCLUDE}"
 then
     LIBPQ_OLD_LDFLAGS=$LDFLAGS
     LIBPQ_OLD_CPPFLAGS=$CPPFLAGS
-    LDFLAGS="$LDFLAGS -L${LIBPQ_HOME}/lib"
-    CPPFLAGS="$CPPFLAGS -I${LIBPQ_HOME}/include"
+    CPPFLAGS="$CPPFLAGS -I${LIBPQ_INCLUDE}"
     LIBS="$LIBS -lssl -lcrypto"
     AC_LANG_SAVE
     AC_LANG_C
@@ -80,15 +79,15 @@
     AC_LANG_RESTORE
     if test "$pgsql_cv_libpq" = "yes" -a "$pgsql_cv_libpqfe_h" = "yes"
     then
-        AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
+        AC_MSG_CHECKING(pgsql)
         AC_MSG_RESULT(ok)
         LIBS="$LIBS -lpq"
     else
-        AC_MSG_CHECKING(pgsql in ${LIBPQ_HOME})
+        AC_MSG_CHECKING(pgsql)
         LDFLAGS="$LIBPQ_OLD_LDFLAGS"
         CPPFLAGS="$LIBPQ_OLD_CPPFLAGS"
         AC_MSG_RESULT(failed)
-        AC_MSG_ERROR(you must specify a valid pgsql installation with
--with-pgsql=DIR)
+        AC_MSG_ERROR(you must specify the directory of your pgsql headers
with --with-pgsql-headers=DIR)
     fi
 fi
 ])