[Home]

Summary:ASTERISK-00372: [patch] adjusting Makefile for cdr_pgsql makes Debian users happy
Reporter:florian (florian)Labels:
Date Opened:2003-10-11 14:08:46Date Closed:2011-06-07 14:10:05
Priority:MinorRegression?No
Status:Closed/CompleteComponents:Core/General
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) pgsqldeb.diff
( 1) pgsqldeb2.diff
Description:The current cdr/Makefile does not account for Debian Woody default PostgreSQL availability. It doesn't look in the right places.

****** ADDITIONAL INFORMATION ******

Solution is simple: I added directory paths for /usr/include/postgresql and
/usr/lib/postgresql/lib
These are locations that are used when using apt-get to install Debian
Woody PostgreSQL and libs.

In addition to this: The tests in cdr/Makefile are not sufficient to work
on Debian Woody boxes;

#
# PostgreSQL stuff...  Autoconf anyone??
#
MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql
] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ]
 || [ -f /usr/include/libpq-fe.h ] || [ -d /usr/include/postgresql ] ;
then echo "cdr_pgsql.so"; fi)
CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo
"-I/usr/local/pgsql/include"; fi)
CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo
"-I/usr/include/pgsql"; fi)
CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo
"-I/usr/local/include/pgsql"; fi)
CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo
"-I/opt/pgsql/include"; fi)
CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo
"-I/usr/include"; fi)
CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo
"-I/usr/include/postgresql"; fi)
MLFLAGS=
MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi)
MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo
"-L/usr/local/pgsql/lib"; fi)
MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo
"-L/usr/local/lib/pgsql"; fi)
MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi)
MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi)
MLFLAGS+=$(shell if [ -d /usr/lib/postgresql ]; then echo
"-L/usr/lib/postgresql/lib"; fi)
Comments:By: Brian West (bkw918) 2003-11-22 16:11:07.000-0600

Please attach a diff -u

bkw

By: ww (ww) 2003-12-05 16:09:03.000-0600

autoconf support is in the works

By: Brian West (bkw918) 2003-12-05 16:13:18.000-0600

autoconf will be nice.. hope it makes the cut.

By: florian (florian) 2003-12-05 16:18:46.000-0600

Diff of the modifications attached. Hope it helps...

By: ww (ww) 2003-12-05 17:24:18.000-0600

the attached patch, pgsql2.diff should do it
(the patch you uploaded had a wrapped line that,
broke it and you don't need to add -L/usr/lib/postgresql/lib
because that is where postgresql keeps its own shared libraries.
libpq is in /usr/lib)

By: florian (florian) 2003-12-05 23:09:09.000-0600

aha. okay :-)

By: Brian West (bkw918) 2004-01-10 18:12:44.000-0600

Already fixed in CVS plese confirm or reopen otherwise.