retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Use pwlib-config CCFLAGS if available, guess only if we have to. 

Define by default PHAS_TEMPLATES only for ancient versions of pwlib.
Avoid having the ptlib include path twice.


git-svn-id: http://voip.null.ro/svn/yate@4638 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2011-09-28 18:31:35 +00:00
parent 5059888d9d
commit f13c04f9d1
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.in
View File

@ -972,6 +972,7 @@ if [[ "x$verpw" = "x" ]]; then
verpw=`cat "$ac_cv_use_pwlib/include/ptbuildopts.h" 2>/dev/null | sed -n 's/^.*PWLIB_VERSION "\([[^"]]*\)".*$/\1/p'`
fi
vpw=`echo "$verpw" | $csed "$vsed" | $csed "$vsed"`
flgpw=""
PWLIB_INC="-I$ac_cv_use_pwlib/include" # Base dir, ok for ptlib
if [[ "$vpw" '<' "02.00.00" ]]; then
# Pwlib-1.xm no ptlib (2.x) install into ptlib
@ -979,11 +980,17 @@ if [[ "$vpw" '<' "02.00.00" ]]; then
if [[ "$vpw" '<' "01.06.00" ]]; then
# Very old pwlib needs more includes.
PWLIB_INC="$PWLIB_INC/unix/ptlib $PWLIB_INC/unix $PWLIB_INC"
flgpw="-DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES"
fi
else
#Grab cflags for PTLIB 2.x
PWLIB_INC="$PWLIB_INC `$ptconfig --ccflags 2>/dev/null`"
fi
if [[ "x$flgpw" = "x" ]]; then
flgpw="`$ptconfig --ccflags 2>/dev/null`"
if [[ "x$flgpw" = "x" ]]; then
# Last resort, minimal guess
flgpw="-D_REENTRANT"
fi
fi
PWLIB_INC="$PWLIB_INC $flgpw"
if [[ -f "$incpw" -a -f "$libpw" ]]; then
HAVE_PWLIB=installed
@ -1003,7 +1010,9 @@ else
if [[ -f "$incpw" -a -f "$libpw" ]]; then
prtti=`"$ptconfig" --ccflags 2>/dev/null | sed -n 's/^.*\(-f[[^ ]]*rtti\).*$/\1/p'`
HAVE_PWLIB=sources
PWLIB_INC="-I$ac_cv_use_pwlib/include $PWLIB_INC"
if [[ "$vpw" '<' "02.00.00" ]]; then
PWLIB_INC="-I$ac_cv_use_pwlib/include $PWLIB_INC"
fi
PWLIB_LIB=`echo "$libpw"|sed 's,^\(.*\)/lib,-L\1 -l,; s,\.so$,,'`
PWLIB_RUN=":"`echo "$libpw"|sed 's,/[[^/]]*$,,'`
case "x$prtti" in

2
modules/Makefile.in
View File

@ -284,7 +284,7 @@ server/analogdetect.yate: ../libs/ymodem/libyatemodem.a
server/analogdetect.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymodem
server/analogdetect.yate: LOCALLIBS = -L../libs/ymodem -lyatemodem
h323chan.yate: LOCALFLAGS = -DPHAS_TEMPLATES -D_REENTRANT -DP_HAS_SEMAPHORES @H323_INC@
h323chan.yate: LOCALFLAGS = @H323_INC@
h323chan.yate: LOCALLIBS = @H323_LIB@
server/pgsqldb.yate: LOCALFLAGS = $(PGSQL_INC)