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

diff --git a/configure.ac b/configure.ac
index 3ba77eeb93432fd07d28b3d56d2c4d460868e1da..0b3cc902ca2af92c0a361433f833b97a8f05b349 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
+    ])
   ])
 ])
 

diff --git a/debian/control-modules b/debian/control-modules
index 56efdc06f6a38c2330144fab129604ac24dc7846..15174f6c00ff526ec58e6d2c3090f4447dcd5626 100644 (file)
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -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

diff --git a/debian/rules b/debian/rules
index f8901655530284a8b53dbaa08ffede60017b99aa..b403d0aecc2a100eb30d53b86c7fd48bae8c7256 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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