Flex drove me crazy with "you just got jammed" :/.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index de80c5306bcbc694244562ac499ac252eb4f46c5..a8ef86bb20859147ca55fb628775bb18622bf882 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Cycript - Optimizing JavaScript Compiler/Runtime
 dnl Cycript - Optimizing JavaScript Compiler/Runtime

-dnl Copyright (C) 2009-2014  Jay Freeman (saurik)
+dnl Copyright (C) 2009-2015  Jay Freeman (saurik)

 
 dnl GNU Affero General Public License, Version 3 {{{
 dnl
 
 dnl GNU Affero General Public License, Version 3 {{{
 dnl


@@ -19,7 +19,7 @@ dnl }}}
 
 AC_PREREQ([2.65])
 AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/])
 
 AC_PREREQ([2.65])
 AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/])

-AC_COPYRIGHT([Copyright (C) 2009-2014  Jay Freeman (saurik)])
+AC_COPYRIGHT([Copyright (C) 2009-2015  Jay Freeman (saurik)])

 
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])


@@ -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-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-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])

+CY_TEST_FLAG([-Wno-tautological-undefined-compare])

 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
 AX_PTHREAD
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
 AX_PTHREAD


@@ -148,7 +150,7 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     ], [
         AC_SUBST([CY_EXECUTE], [1])
     ], [
     ], [
         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`])
             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])
     ]))
 
         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_SUBST([CY_JAVA], [1])
         CY_LT_LIB([LTJAVA], [AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [
         ])])
     ], [
         AC_SUBST([CY_JAVA], [0])

-    ])
+    ])])

 
     AC_LANG_PUSH([Objective C++])
 
 
     AC_LANG_PUSH([Objective C++])