kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FreeTDM: Rework libpri detection code to accept a custom installation prefix. 

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

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich 2011-10-26 19:41:07 +02:00
parent fd495dbbe1
commit ec72d8d7fc
2 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/freetdm/Makefile.am
View File

@ -184,9 +184,9 @@ endif
if HAVE_LIBPRI if HAVE_LIBPRI
mod_LTLIBRARIES += ftmod_libpri.la 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_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_CFLAGS = $(FTDM_CFLAGS) $(AM_CFLAGS) $(LIBPRI_CPPFLAGS)
ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version -lpri ftmod_libpri_la_LDFLAGS = -shared -module -avoid-version $(LIBPRI_LDFLAGS)
ftmod_libpri_la_LIBADD = libfreetdm.la ftmod_libpri_la_LIBADD = libfreetdm.la $(LIBPRI_LIBS)
endif endif
if HAVE_PRITAP if HAVE_PRITAP

45
libs/freetdm/configure.ac
View File

@ -194,28 +194,46 @@ AM_CONDITIONAL([HAVE_OPENR2], [test "${HAVE_OPENR2}" = "yes"])
# #
HAVE_LIBPRI="no" HAVE_LIBPRI="no"
AC_ARG_WITH([libpri], AC_ARG_WITH([libpri],
[AS_HELP_STRING([--with-libpri], [Install ftmod_libpri])], [AS_HELP_STRING([--with-libpri@<:@=PREFIX@:>@], [Install ftmod_libpri])],
[case "${withval}" in [case "${withval}" in
no) enable_libpri="no" ;; no|yes) with_libpri="${withval}" ;;
*) enable_libpri="yes" ;; *) AS_IF([test -d "${withval}"],
[with_libpri="${withval}"],
[AC_MSG_ERROR([Invalid argument for --with-libpri, \"${withval}\" is not a directory])]
) ;;
esac], esac],
[enable_libpri="no"] [with_libpri="no"]
) )
if test "${enable_libpri}" != "no" if test "x${with_libpri}" != "xno"
then then
save_LIBS="${LIBS}"
save_CPPFLAGS="${CPPFLAGS}"
save_LDFLAGS="${LDFLAGS}"
LIBPRI_CPPFLAGS=""
LIBPRI_LDFLAGS=""
AC_MSG_RESULT([${as_nl}<<>> Digium libpri]) 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" LIBS="${LIBS} -lpri"
AC_MSG_CHECKING([whether libpri is usable]) AC_MSG_CHECKING([whether libpri is usable])
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(
[#include <libpri.h>], [#include <libpri.h>],
[const char *version = pri_get_version();] [const char *version = pri_get_version();]
)], )],
[AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])
HAVE_LIBPRI="yes"],
[AC_MSG_RESULT([no]) [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]) AC_MSG_CHECKING([whether libpri has BRI support])
@ -241,10 +259,17 @@ then
[AC_MSG_RESULT([no]) [AC_MSG_RESULT([no])
AC_MSG_NOTICE([You will need libpri-1.4.12_beta1 or newer for AOC event support])] 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}" LIBS="${save_LIBS}"
LDFLAGS="${save_LDFLAGS}"
CPPFLAGS="${save_CPPFLAGS}"
fi fi
HAVE_LIBPRI="${enable_libpri}" AM_CONDITIONAL([HAVE_LIBPRI],[test "x${HAVE_LIBPRI}" = "xyes"])
AM_CONDITIONAL([HAVE_LIBPRI],[test "${enable_libpri}" = "yes"])
## ##
# Sangoma Wanpipe # Sangoma Wanpipe