Build and configure required libraries on Android.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4c5d65cac8fde5c1c04d7e8f1da9c71386000c3e..382ddf0b7da86067b209172d7e1088a8731284a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -160,7 +160,9 @@ dnl }}}
 
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
-    CY_LT_LIB([LTJAVASCRIPTCORE], [AC_CHECK_FRAMEWORK([JavaScriptCore], [
+    CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [
+        AC_SUBST([CY_EXECUTE], [1])
+    ], [AC_CHECK_FRAMEWORK([JavaScriptCore], [
         #include <JavaScriptCore/JSBase.h>
     ], [
         JSEvaluateScript(0, 0, 0, 0, 0, 0);
@@ -174,7 +176,7 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
                 AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs $cy_webkit_pkg`])
             ], [:]); if test "x$CY_EXECUTE" = x1; then break; fi
         done
-    ])])
+    ])])])
 ])
 
 AC_DEFUN([CY_CHECK_JAVASCRIPT], [
@@ -198,22 +200,6 @@ dnl }}}
 AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
 AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
 
-AM_COND_IF([CY_CONSOLE], [
-dnl APR_FIND_APR {{{
-AS_IF([test "x$LTLIBAPR" != x], [
-    AC_SUBST([LTLIBAPR])
-], [
-    APR_FIND_APR([], [], [1], [1])
-AS_CASE([$apr_found], [yes], [
-    AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
-    AC_LIB_APPENDTOVAR([LTLIBAPR], [`$apr_config --link-libtool`])
-    AC_SUBST([LTLIBAPR])
-], [
-    AC_MSG_ERROR([missing "libapr"])
-])])
-dnl }}}
-])
-
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
         AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags libffi`])