diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac index d166233f00..a888d20ef4 100644 --- a/libs/freetdm/configure.ac +++ b/libs/freetdm/configure.ac @@ -236,6 +236,21 @@ then AC_MSG_ERROR([libpri not found or unusable (see config.log for details)])] ) + AC_MSG_CHECKING([whether libpri is too old]) + AC_PREPROC_IFELSE( + [AC_LANG_PROGRAM( + [#include <libpri.h>], + [#if !defined(PRI_IO_FUNCS) + #error "libpri is lacking PRI_IO_FUNCS" + #elif !defined(PRI_NEW_SET_API) + #error "libpri is lacking PRI_NEW_SET_API" + #endif] + )], + [AC_MSG_RESULT([no])], + [AC_MSG_RESULT([yes]) + AC_MSG_ERROR([Your version of libpri is too old (pre 1.2), please update!])] + ) + AC_MSG_CHECKING([whether libpri has BRI support]) AC_LINK_IFELSE( [AC_LANG_PROGRAM( diff --git a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c index b8871cf70c..2e11f52f26 100644 --- a/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c +++ b/libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c @@ -115,7 +115,6 @@ static FIO_CHANNEL_REQUEST_FUNCTION(isdn_channel_request) } -#ifdef PRI_NEW_SET_API /** * \brief Logs a libpri message * \param pri libpri structure @@ -147,25 +146,6 @@ static void s_pri_error(struct pri *pri, char *s) ftdm_log(FTDM_LOG_ERROR, "%s", s); } } -#else /* !PRI_NEW_SET_API */ -/** - * \brief Logs a libpri message - * \param s Message string - */ -static void s_pri_message(char *s) -{ - ftdm_log(FTDM_LOG_DEBUG, "%s", s); -} - -/** - * \brief Logs a libpri error - * \param s Error string - */ -static void s_pri_error(char *s) -{ - ftdm_log(FTDM_LOG_ERROR, "%s", s); -} -#endif #define PRI_DEBUG_Q921_ALL (PRI_DEBUG_Q921_RAW | PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_STATE)