Skip site navigation (1) Skip section navigation (2)

Re: configure "stuff"

From: Dave Page <dpage(at)pgadmin(dot)org>
To: Guillaume Lelarge <guillaume(at)lelarge(dot)info>
Cc: pgadmin-hackers <pgadmin-hackers(at)postgresql(dot)org>
Subject: Re: configure "stuff"
Date: 2011-06-26 19:35:27
Message-ID: BANLkTi=oA7gAxcR=KRsaoQRPFEQt9voMAA@mail.gmail.com (view raw or flat)
Thread:
Lists: pgadmin-hackers
On Sat, Jun 25, 2011 at 7:26 PM, Guillaume Lelarge
<guillaume(at)lelarge(dot)info> wrote:
> Hi,
>
> I received an email a few days ago (humm, weeks) about issues with
> compiling pgAdmin.
>
> ====== extract ======
> The file pgadmin/db/keywords.c has this statement in it:
> #include <server/parser/kwlist.h>
>
>  Now it comes that pg_config does spit out either
> /usr/include/postgresql for the --includedir switch (for client things)
> and /usr/include/postgresql/9.0/server for --includedir-server. Given
> that both seems to work well for other stuff I'm unsure whether there is
> a problem here and it should rather be #include <parser/kwlist.h> (or
> the file be moved out of server context).
> ====== end of extract ======
>
> I took a quick look at it, and it seems we forgot something. If I'm not
> wrong, we don't use the --includedir-server switch for our includes in
> the configure script (actually, in the acinclude.m4 file). And it breaks
> the compilation on Debian when a user uses the PostgreSQL package on
> Debian or any other .deb linux distributions. We already do this for the
> package include dir (--pkgincludedir), I don't see any reason why we
> shouldn't do it for the server one.

Hmm, that would explain it - until now it's worked for some people and
not for others and we've assumed it was a broken -dev package. I
assume something like this does the trick:

diff --git a/acinclude.m4 b/acinclude.m4
index e379c62..f5eeaa4 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -548,8 +548,9 @@ AC_DEFUN([SETUP_POSTGRESQL],
                AC_LANG_RESTORE

                PG_INCLUDE=`${PG_CONFIG} --includedir`
+               PG_SVRINCLUDE=`${PG_CONFIG} --includedir-server`
                PG_PKGINCLUDE=`${PG_CONFIG} --pkgincludedir`
-               CPPFLAGS="$CPPFLAGS -I${PG_INCLUDE} -I${PG_PKGINCLUDE}"
+               CPPFLAGS="$CPPFLAGS -I${PG_INCLUDE} -I${PG_SVRINCLUDE}
-I${PG_PKGINCLUDE}"

                PG_VERSION=`${PG_CONFIG} --version`




-- 
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.com
The Enterprise PostgreSQL Company

In response to

Responses

pgadmin-hackers by date

Next:From: TimonDate: 2011-06-27 05:03:41
Subject: Re: pgAdmin III commit: Rename "Replication" to "Slony Replication"
Previous:From: Dave PageDate: 2011-06-26 19:29:19
Subject: Re: First test of the Database Designer

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group