Sort-of improve multi-line editor when in vi mode.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b9dc7f82b25f95a74a855afa8f7c50057ac6f31d..88e32309d5896f6ca5308ae819ab6ec6bdeb3507 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,9 @@ AC_DEFUN([CY_TRY], [
     AS_IF([test "x$cy_good" = x1], ]$4[, ]$5[)
 ]) dnl }}}
 
+AC_ARG_VAR([LFLAGS], [flex flags])
+AS_IF([test "x$LFLAGS" = x], [LFLAGS="--full --ecs"])
+
 AC_DEFUN([CY_TEST_FLAG_], [
     AC_LANG_PUSH(]$2[)
     AC_MSG_CHECKING([for ]]$4[[ ]]$1[)
@@ -150,7 +153,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`])
@@ -193,6 +196,10 @@ AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
 AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
 AS_CASE([$CY_EXECUTE], [1], [
+    CY_LT_LIB([LTLIBUV], [AC_CHECK_HEADERS([uv.h], [
+        AC_SEARCH_LIBS([uv_loop_init], [uv])
+    ])])
+
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
 
     CY_LT_LIB([LTLIBFFI], AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
@@ -202,13 +209,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++])