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

FS-11396: [mod_v8] Use proper libv8 naming.

This commit is contained in:
Andrey Volk 2018-09-19 21:39:35 +03:00
parent e08f819b5a
commit e77c445c3a
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -1482,17 +1482,20 @@ PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[
AM_CONDITIONAL([HAVE_MEMCACHED],[false]) AM_CONDITIONAL([HAVE_MEMCACHED],[false])
]) ])
PKG_CHECK_MODULES([V8FS_STATIC], [v8fs_static >= 6.1.298],[ PKG_CHECK_MODULES([V8FS_STATIC], [v8-6.1_static >= 6.1.298],[
AM_CONDITIONAL([HAVE_V8FS],[true])],[
PKG_CHECK_MODULES([V8FS_STATIC], [v8fs_static >= 6.1.298],[
AM_CONDITIONAL([HAVE_V8FS],[true])],[ AM_CONDITIONAL([HAVE_V8FS],[true])],[
PKG_CHECK_MODULES([V8FS_STATIC], [v8 >= 6.1.298],[ PKG_CHECK_MODULES([V8FS_STATIC], [v8 >= 6.1.298],[
AM_CONDITIONAL([HAVE_V8FS],[true])],[ AM_CONDITIONAL([HAVE_V8FS],[true])],[
if module_enabled mod_v8; then if module_enabled mod_v8; then
AC_MSG_ERROR([You need to either install libv8fs-dev (>= 6.1.298) or disable mod_v8 in modules.conf]) AC_MSG_ERROR([You need to either install libv8-6.1-dev (>= 6.1.298), libv8fs-dev (>= 6.1.298) or disable mod_v8 in modules.conf])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AM_CONDITIONAL([HAVE_V8FS],[false]) AM_CONDITIONAL([HAVE_V8FS],[false])
fi fi
]) ])
])
]) ])
PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[ PKG_CHECK_MODULES([AMQP], [librabbitmq >= 0.5.2],[

2
debian/control-modules vendored
View File

@ -650,7 +650,7 @@ Build-Depends: python-dev
Module: languages/mod_v8 Module: languages/mod_v8
Description: mod_v8 Description: mod_v8
Adds mod_v8. Adds mod_v8.
Build-Depends: git, libv8fs-6.1-dev Build-Depends: git, libv8-6.1-dev
Module: languages/mod_yaml Module: languages/mod_yaml
Description: mod_yaml Description: mod_yaml

3
debian/rules vendored
View File

@ -75,8 +75,7 @@ override_dh_auto_clean:
--prefix=/usr --localstatedir=/var --sysconfdir=/etc \ --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
--with-gnu-ld --with-python --with-erlang --with-openssl \ --with-gnu-ld --with-python --with-erlang --with-openssl \
--enable-core-odbc-support --enable-zrtp \ --enable-core-odbc-support --enable-zrtp \
--enable-core-pgsql-support \ --enable-core-pgsql-support
--enable-static-v8 --disable-parallel-build-v8
touch $@ touch $@
override_dh_auto_configure: .stamp-configure override_dh_auto_configure: .stamp-configure