Fix lexer hack correctness check when more spaces.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4de80a940ef46cbc8b98d50c1d31cf293bc7c3ca..a8ef86bb20859147ca55fb628775bb18622bf882 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -122,8 +122,10 @@ dnl XXX: this is used to support GNU Objective-C struct objc_method
 CY_TEST_FLAG([-Wno-deprecated-declarations])
 
 CY_TEST_FLAG([-Wno-dangling-else])
+CY_TEST_FLAG([-Wno-empty-body])
 CY_TEST_FLAG([-Wno-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
+CY_TEST_FLAG([-Wno-tautological-undefined-compare])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
 AX_PTHREAD
@@ -148,7 +150,7 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     ], [
         AC_SUBST([CY_EXECUTE], [1])
     ], [
-        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do
+        for cy_webkit_pkg in "javascriptcoregtk-4.0"; do
             PKG_CHECK_MODULES([WEBKIT], [$cy_webkit_pkg], [
                 AC_SUBST([CY_EXECUTE], [1])
                 AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags $cy_webkit_pkg`])
@@ -200,13 +202,17 @@ AS_CASE([$CY_EXECUTE], [1], [
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
     ]))
 
-    AC_CHECK_HEADER([jni.h], [
+    AC_CHECK_FRAMEWORK([JavaVM], [
+        #include <JavaVM/jni.h>
+    ], [JNI_GetCreatedJavaVMs(NULL, 0, NULL);], [
+        AC_SUBST([CY_JAVA], [1])
+    ], [AC_CHECK_HEADER([jni.h], [
         AC_SUBST([CY_JAVA], [1])
         CY_LT_LIB([LTJAVA], [AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [
         ])])
     ], [
         AC_SUBST([CY_JAVA], [0])
-    ])
+    ])])
 
     AC_LANG_PUSH([Objective C++])