From ec72d8d7fc07a98e9a20270f6ea125a10b6a45b9 Mon Sep 17 00:00:00 2001
From: Stefan Knoblich <stkn@openisdn.net>
Date: Wed, 26 Oct 2011 19:41:07 +0200
Subject: [PATCH] FreeTDM: Rework libpri detection code to accept a custom
 installation prefix.

Example: --with-libpri=/usr/local

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
---
 libs/freetdm/Makefile.am  |  6 +++---
 libs/freetdm/configure.ac | 45 ++++++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index d96c3f1963..35f1cecd1e 100644
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -184,9 +184,9 @@ endif
 if HAVE_LIBPRI
 mod_LTLIBRARIES += ftmod_libpri.la
 ftmod_libpri_la_SOURCES = $(SRC)/ftmod/ftmod_libpri/ftmod_libpri.c $(SRC)/ftmod/ftmod_libpri/lpwrap_pri.c
-ftmod_libpri_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS)
-ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version -lpri
-ftmod_libpri_la_LIBADD  = libfreetdm.la
+ftmod_libpri_la_CFLAGS  = $(FTDM_CFLAGS) $(AM_CFLAGS) $(LIBPRI_CPPFLAGS)
+ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version $(LIBPRI_LDFLAGS)
+ftmod_libpri_la_LIBADD  = libfreetdm.la $(LIBPRI_LIBS)
 endif
 
 if HAVE_PRITAP
diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index f59cab95d6..292c1e7cfa 100644
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -194,28 +194,46 @@ AM_CONDITIONAL([HAVE_OPENR2], [test "${HAVE_OPENR2}" = "yes"])
 #
 HAVE_LIBPRI="no"
 AC_ARG_WITH([libpri],
-	[AS_HELP_STRING([--with-libpri], [Install ftmod_libpri])],
+	[AS_HELP_STRING([--with-libpri@<:@=PREFIX@:>@], [Install ftmod_libpri])],
 	[case "${withval}" in
-	 no)	enable_libpri="no" ;;
-	 *)	enable_libpri="yes" ;;
+	 no|yes) with_libpri="${withval}" ;;
+	 *) AS_IF([test -d "${withval}"],
+		[with_libpri="${withval}"],
+		[AC_MSG_ERROR([Invalid argument for --with-libpri, \"${withval}\" is not a directory])]
+	    ) ;;
 	 esac],
-	[enable_libpri="no"]
+	[with_libpri="no"]
 )
-if test "${enable_libpri}" != "no"
+if test "x${with_libpri}" != "xno"
 then
+	save_LIBS="${LIBS}"
+	save_CPPFLAGS="${CPPFLAGS}"
+	save_LDFLAGS="${LDFLAGS}"
+
+	LIBPRI_CPPFLAGS=""
+	LIBPRI_LDFLAGS=""
+
 	AC_MSG_RESULT([${as_nl}<<>> Digium libpri])
 
-	save_LIBS="${LIBS}"
+	AS_IF([test "x${with_libpri}" != "xyes"],
+		[LIBPRI_CPPFLAGS="-I${with_libpri}/include"
+		 LIBPRI_LDFLAGS="-L${with_libpri}/lib"],
+	)
+
+	LDFLAGS="${save_LDFLAGS} ${LIBPRI_LDFLAGS}"
+	CPPFLAGS="${save_CPPFLAGS} ${LIBPRI_CPPFLAGS}"
 	LIBS="${LIBS} -lpri"
+
 	AC_MSG_CHECKING([whether libpri is usable])
 	AC_LINK_IFELSE(
 		[AC_LANG_PROGRAM(
 			[#include <libpri.h>],
 			[const char *version = pri_get_version();]
 		)],
-		[AC_MSG_RESULT([yes])],
+		[AC_MSG_RESULT([yes])
+		 HAVE_LIBPRI="yes"],
 		[AC_MSG_RESULT([no])
-		 AC_MSG_ERROR([libpri is not installed or unusable (see config.log for details)])]
+		 AC_MSG_ERROR([libpri not found or unusable (see config.log for details)])]
 	)
 
 	AC_MSG_CHECKING([whether libpri has BRI support])
@@ -241,10 +259,17 @@ then
 		[AC_MSG_RESULT([no])
 		 AC_MSG_NOTICE([You will need libpri-1.4.12_beta1 or newer for AOC event support])]
 	)
+
+	# libpri is available, set variables for Makefile(.am)
+	AC_SUBST([LIBPRI_LIBS], [-lpri])
+	AC_SUBST([LIBPRI_LDFLAGS])
+	AC_SUBST([LIBPRI_CPPFLAGS])
+
 	LIBS="${save_LIBS}"
+	LDFLAGS="${save_LDFLAGS}"
+	CPPFLAGS="${save_CPPFLAGS}"
 fi
-HAVE_LIBPRI="${enable_libpri}"
-AM_CONDITIONAL([HAVE_LIBPRI],[test "${enable_libpri}" = "yes"])
+AM_CONDITIONAL([HAVE_LIBPRI],[test "x${HAVE_LIBPRI}" = "xyes"])
 
 ##
 # Sangoma Wanpipe