Fix how include path is generated when PWLib exists only as source directory.
git-svn-id: http://voip.null.ro/svn/yate@2005 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
67a13b0f15
commit
193bfdc322
|
@ -611,6 +611,9 @@ if [[ "x$local_lib" != "xlib" -a ! -f "$libpw" ]]; then
|
||||||
local_lib="lib"
|
local_lib="lib"
|
||||||
libpw="$ac_cv_use_pwlib/$local_lib/libpt.so"
|
libpw="$ac_cv_use_pwlib/$local_lib/libpt.so"
|
||||||
fi
|
fi
|
||||||
|
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
|
||||||
PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib"
|
PWLIB_INC="-I$ac_cv_use_pwlib/include/ptlib"
|
||||||
vpw=`echo "$verpw" | sed "$vsed" | sed "$vsed"`
|
vpw=`echo "$verpw" | sed "$vsed" | sed "$vsed"`
|
||||||
if [[ "$vpw" '<' "01.06.00" ]]; then
|
if [[ "$vpw" '<' "01.06.00" ]]; then
|
||||||
|
@ -633,6 +636,7 @@ else
|
||||||
if [[ -f "$incpw" -a -f "$libpw" ]]; then
|
if [[ -f "$incpw" -a -f "$libpw" ]]; then
|
||||||
prtti=`"$ac_cv_use_pwlib/make/ptlib-config" --ccflags 2>/dev/null | sed -n 's/^.*\(-f[[^ ]]*rtti\).*$/\1/p'`
|
prtti=`"$ac_cv_use_pwlib/make/ptlib-config" --ccflags 2>/dev/null | sed -n 's/^.*\(-f[[^ ]]*rtti\).*$/\1/p'`
|
||||||
HAVE_PWLIB=sources
|
HAVE_PWLIB=sources
|
||||||
|
PWLIB_INC="-I$ac_cv_use_pwlib/include $PWLIB_INC"
|
||||||
PWLIB_LIB="-L$ac_cv_use_pwlib/lib -l`echo "$libpw"|sed 's,^.*/lib,,; s,\.so$,,'`"
|
PWLIB_LIB="-L$ac_cv_use_pwlib/lib -l`echo "$libpw"|sed 's,^.*/lib,,; s,\.so$,,'`"
|
||||||
PWLIB_RUN=":$ac_cv_use_pwlib/lib"
|
PWLIB_RUN=":$ac_cv_use_pwlib/lib"
|
||||||
case "x$prtti" in
|
case "x$prtti" in
|
||||||
|
|
Loading…
Reference in New Issue