On Friday 20 June 2003 15:28, Adam H. Pendleton wrote:
> Please send me any patches that need to
> be reviewed and I will take care of them today.

Hi Adam,

Nice to know you are back. Two weeks ago, I was sick like hell sleeping in bed 
a week or so. This did not happen to me since I was a child...

My current issues are related to packaging:

- pgAdmin3 configuration script should query wxgtk2ud-2.5-config and not 
wx-config symlink. The reasons is that pgAdmin3 cannot conflict with existing 
wxGTK 2.4 installations. Otherwise, it will never enter a Linux distribution.

- Mandrake 9.1 provides rather old autoconf (2.13-16mdk) and automake 
(1.4-21.p6.mdk) packages. No update is provided on Mandrake Cooker, the 
equivalent of Rawhide. Also, I tried to install these packages from source, 
but the installation did not pass the test. So can we do? Would it be 
possible to use a more complex autoconf script ... which would work on old 
autoconf + automake?

- SuSE 8.2 installation needs a patch to find PostgreSQL headers. A patch has 
been sent to Dave. Please find it enclosed.

Your help is welcome. Do you think the wxWindows 2.5 CVS libraries are stable 
enough to produce a MacOsX version? This would be a killing news...

Cheers,
Jean-Michel
? Makefile
? Makefile.in
? aclocal.m4
? autom4te.cache
? config.h
? config.h.in
? config.log
? config.status
? configure
? pgadmin3-0.1.1.tar.gz
? stamp-h1
? config/config.guess
? config/config.sub
? config/depcomp
? config/install-sh
? config/missing
? config/mkinstalldirs
? src/.deps
? src/Makefile
? src/Makefile.in
Index: Makefile.am
===================================================================
RCS file: /disk1/cvsroot/pgadmin3/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- Makefile.am	13 Jun 2003 11:37:07 -0000	1.9
+++ Makefile.am	19 Jun 2003 11:25:25 -0000
@@ -4,7 +4,7 @@
 #
 # Makefile - Makefile for *nix systems
 SUBDIRS = src
-EXTRA_DIST = 	README.txt BUGS.txt LICENCE.txt 
+EXTRA_DIST = 	README.txt BUGS.txt LICENCE.txt pgadmin3.spec
 
 nobase_dist_pkgdata_DATA = \
 		docs/en_US/pg/*.gif docs/en_US/pg/*.html docs/en_US/pg/*.css \
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	19 Jun 2003 11:25:25 -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 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/include/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
 ])
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]

Reply via email to