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

Merge pull request #1430 from signalwire/libksconfigure 

[Build-System] Add better error reporting to configure when libks or signalwire-client are missing and mod_verto or mod_signalwire enabled.
This commit is contained in:
Andrey Volk 2021-11-03 23:19:48 +03:00 committed by GitHub
parent 0fdd5b6727 2663872953
commit 038cd82948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -1531,11 +1531,25 @@ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
PKG_CHECK_MODULES([KS], [libks >= 1.1.0],[ PKG_CHECK_MODULES([KS], [libks >= 1.1.0],[
AM_CONDITIONAL([HAVE_KS],[true])],[ AM_CONDITIONAL([HAVE_KS],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])]) if module_enabled mod_verto; then
AC_MSG_ERROR([You need to either install libks or disable mod_verto in modules.conf])
else
if module_enabled mod_signalwire; then
AC_MSG_ERROR([You need to either install libks or disable mod_signalwire in modules.conf])
else
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_KS],[false])
fi
fi
])
PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[ PKG_CHECK_MODULES([SIGNALWIRE_CLIENT], [signalwire_client >= 1.0.0],[
AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[ AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])]) if module_enabled mod_signalwire; then
AC_MSG_ERROR([You need to either install signalwire-client-c or disable mod_signalwire in modules.conf])
else
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_SIGNALWIRE_CLIENT],[false])
fi
])
PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[ PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[
AM_CONDITIONAL([HAVE_AMQP],[true])],[ AM_CONDITIONAL([HAVE_AMQP],[true])],[

8
src/mod/endpoints/mod_verto/Makefile.am
View File

@ -1,6 +1,7 @@
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_verto MODNAME=mod_verto
if HAVE_KS
mod_LTLIBRARIES = mod_verto.la mod_LTLIBRARIES = mod_verto.la
mod_verto_la_SOURCES = mod_verto.c mcast/mcast.c mod_verto_la_SOURCES = mod_verto.c mcast/mcast.c
mod_verto_la_CFLAGS = -D__EXTENSIONS__ -D_GNU_SOURCE $(AM_CFLAGS) $(KS_CFLAGS) mod_verto_la_CFLAGS = -D__EXTENSIONS__ -D_GNU_SOURCE $(AM_CFLAGS) $(KS_CFLAGS)
@ -37,3 +38,10 @@ swigclean:
rm -f mcast/mcast_wrap.* mcast/MCAST.so mcast/MCAST.pm mcast/perlxsi.* rm -f mcast/mcast_wrap.* mcast/MCAST.so mcast/MCAST.pm mcast/perlxsi.*
reswig: swigclean mcast/mcast_wrap.cpp mcast/perlxsi.c reswig: swigclean mcast/mcast_wrap.cpp mcast/perlxsi.c
else
install: error
all: error
error:
$(error You must install libks to build mod_verto)
endif