File libsangoma-07-libpri.diff of Package wanpipe
From: Jan Engelhardt <jengelh@medozas.de>
Upstream: tbd
libsangoma/build: use system's libpri
`./configure --with-libpri` is not properly handled by configure.in.
In particular, this patch makes it possible to use libpri which was
installed in default system locations.
---
api/libsangoma/Makefile.am | 5 +++--
api/libsangoma/configure.in | 11 ++++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
Index: wanpipe-3.5.25/api/libsangoma/Makefile.am
===================================================================
--- wanpipe-3.5.25.orig/api/libsangoma/Makefile.am
+++ wanpipe-3.5.25/api/libsangoma/Makefile.am
@@ -28,14 +28,15 @@ library_include_HEADERS = libsangoma.h l
if LIBPRI
library_include_HEADERS += sangoma_pri.h
-AM_CFLAGS += -I@LIBPRI_PATH@
endif
+AM_CFLAGS += ${LIBPRI_CFLAGS}
lib_LTLIBRARIES = libsangoma.la
libsangoma_la_LDFLAGS = -version-info @LIBSANGOMA_LT_CURRENT@:@LIBSANGOMA_LT_REVISION@:@LIBSANGOMA_LT_AGE@
if LIBPRI
-libsangoma_la_LIBADD = -L@LIBPRI_PATH@ -lpri
+libsangoma_la_LDFLAGS += ${LIBPRI_LDFLAGS}
+libsangoma_la_LIBADD = -lpri
endif
# We use powf in the gain code
Index: wanpipe-3.5.25/api/libsangoma/configure.in
===================================================================
--- wanpipe-3.5.25.orig/api/libsangoma/configure.in
+++ wanpipe-3.5.25/api/libsangoma/configure.in
@@ -39,9 +39,14 @@ AC_CHECK_HEADERS(fcntl.h netinet/in.h st
# Checks for libpri support
AC_ARG_WITH(libpri,
- [ --with-libpri=<path> enable pri support],[LIBPRI_PATH="$withval"])
-AM_CONDITIONAL([LIBPRI],[test -d "$LIBPRI_PATH" ])
-AC_SUBST([LIBPRI_PATH])
+ [ --with-libpri=<path> enable pri support],
+ [if test "$withval" != "yes"; then
+ LIBPRI_CFLAGS="-I$withval";
+ LIBPRI_LDFLAGS="-L$withval";
+ fi;])
+AM_CONDITIONAL([LIBPRI], [test "$with_libpri" != "no"])
+AC_SUBST([LIBPRI_CFLAGS])
+AC_SUBST([LIBPRI_LDFLAGS])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_TIME