diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-08-09 19:22:35 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-08-09 19:22:35 +0000 |
| commit | 18d504198139bac964bb24604ff0ef58bba5c722 (patch) | |
| tree | 569d974da4952225515451be420b606635c980f9 /channels | |
| parent | 0d82844cad599d30cb1412158e6baef4eb8ac961 (diff) | |
Use better libss7 detection test and move libpri compile test.
........
Merged revisions 371012 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 371013 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@371030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 11 | ||||
| -rw-r--r-- | channels/sig_pri.c | 2 | ||||
| -rw-r--r-- | channels/sig_ss7.c | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2049ea666..b342e0bae 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -71,12 +71,18 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") * be placed in sig_analog and the duplicated code could be removed. */ -#ifdef HAVE_PRI +#if defined(HAVE_PRI) #include "sig_pri.h" +#ifndef PRI_RESTART +#error "Upgrade your libpri" #endif +#endif /* defined(HAVE_PRI) */ #if defined(HAVE_SS7) #include "sig_ss7.h" +#if defined(LIBSS7_ABI_COMPATIBILITY) +#error "Your installed libss7 is not compatible" +#endif #endif /* defined(HAVE_SS7) */ #ifdef HAVE_OPENR2 @@ -14329,9 +14335,6 @@ static void *mfcr2_monitor(void *data) #endif /* HAVE_OPENR2 */ #if defined(HAVE_PRI) -#ifndef PRI_RESTART -#error "Upgrade your libpri" -#endif static void dahdi_pri_message(struct pri *pri, char *s) { int x; diff --git a/channels/sig_pri.c b/channels/sig_pri.c index 1da6af43e..902c5098d 100644 --- a/channels/sig_pri.c +++ b/channels/sig_pri.c @@ -53,7 +53,7 @@ #include "sig_pri.h" #ifndef PRI_EVENT_FACILITY -#error please update libpri +#error "Upgrade your libpri" #endif /*** DOCUMENTATION diff --git a/channels/sig_ss7.c b/channels/sig_ss7.c index a0e75a063..e6999238b 100644 --- a/channels/sig_ss7.c +++ b/channels/sig_ss7.c @@ -44,6 +44,9 @@ #include "asterisk/transcap.h" #include "sig_ss7.h" +#if defined(LIBSS7_ABI_COMPATIBILITY) +#error "Your installed libss7 is not compatible" +#endif /* ------------------------------------------------------------------- */ |