Re: configure "stuff"
От | Dave Page |
---|---|
Тема | Re: configure "stuff" |
Дата | |
Msg-id | BANLkTi=oA7gAxcR=KRsaoQRPFEQt9voMAA@mail.gmail.com обсуждение исходный текст |
Ответ на | configure "stuff" (Guillaume Lelarge <guillaume@lelarge.info>) |
Ответы |
Re: configure "stuff"
|
Список | pgadmin-hackers |
On Sat, Jun 25, 2011 at 7:26 PM, Guillaume Lelarge <guillaume@lelarge.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
В списке pgadmin-hackers по дате отправления: