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

v1.8
Andrey Volk 4 years ago
parent e08f819b5a
commit e77c445c3a
  1. 19
      configure.ac
  2. 2
      debian/control-modules
  3. 3
      debian/rules

@ -1482,16 +1482,19 @@ PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 0.31],[
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], [v8 >= 6.1.298],[
PKG_CHECK_MODULES([V8FS_STATIC], [v8fs_static >= 6.1.298],[
AM_CONDITIONAL([HAVE_V8FS],[true])],[
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])
else
AC_MSG_RESULT([no])
AM_CONDITIONAL([HAVE_V8FS],[false])
fi
PKG_CHECK_MODULES([V8FS_STATIC], [v8 >= 6.1.298],[
AM_CONDITIONAL([HAVE_V8FS],[true])],[
if module_enabled mod_v8; then
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
AC_MSG_RESULT([no])
AM_CONDITIONAL([HAVE_V8FS],[false])
fi
])
])
])

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

3
debian/rules vendored

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

Loading…
Cancel
Save