Also use CXType walker to for function prototypes.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 52a6ee502d364183e2726e53848b1dbdf676d965..84756bcd2cb06dda88791cae6e0b070f80d50153 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ AS_CASE([$CY_EXECUTE], [1], [
     ])])
 
     CY_LT_LIB([LTLIBSQLITE3], [AC_CHECK_HEADERS([sqlite3.h], [
-        AC_SEARCH_LIBS([sqlite3_open_v2], [sqlite3])
+        AC_SEARCH_LIBS([sqlite3_open_v2], [sqlite3 sqlite])
     ])])
 
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
@@ -225,8 +225,6 @@ AS_CASE([$CY_EXECUTE], [1], [
         AC_SUBST([CY_JAVA], [1])
     ], [AC_CHECK_HEADER([jni.h], [
         AC_SUBST([CY_JAVA], [1])
-        AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [
-        ])
     ], [
         AC_SUBST([CY_JAVA], [0])
     ])])])
@@ -273,7 +271,7 @@ AS_CASE([$CY_EXECUTE], [1], [
         CY_LT_LIB([LTOBJECTIVEC], [AC_CHECK_FRAMEWORK([CoreFoundation], [
             #include <CoreFoundation/CFBase.h>
         ], [CFAllocatorGetDefault();], [
-            AC_SUBST([CY_OBJECTIVEC])
+            AC_SUBST([CY_OBJECTIVEC], [1])
 
             AC_CHECK_FRAMEWORK([Foundation], [
                 #include <Foundation/NSObject.h>
@@ -283,11 +281,13 @@ AS_CASE([$CY_EXECUTE], [1], [
             AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
 
             AS_IF([test "x$GNUSTEP_CONFIG" != x], [
-                AC_SUBST([CY_OBJECTIVEC])
+                AC_SUBST([CY_OBJECTIVEC], [1])
                 AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`])
                 AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`])
             ], [AC_SUBST([CY_OBJECTIVEC], [0])])
         ])])
+    ], [
+        AC_SUBST([CY_OBJECTIVEC], [0])
     ])
 
     AC_LANG_POP([Objective C++])
@@ -298,6 +298,18 @@ AM_CONDITIONAL([CY_RUBY], [test "x$CY_RUBY" = x1])
 AM_CONDITIONAL([CY_PYTHON], [test "x$CY_PYTHON" = x1])
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
+#ifndef __ANDROID__
+#error
+#endif
+])], [
+    AC_SUBST([CY_ANDROID], [1])
+], [
+    AC_SUBST([CY_ANDROID], [0])
+])
+
+AM_CONDITIONAL([CY_ANDROID], [test "x$CY_ANDROID" = x1])
+
 AC_ARG_WITH([libclang], AS_HELP_STRING([--with-libclang], [build bridge definitions using this libclang]), [], [with_libclang=no])
 
 AS_IF([test "x$with_libclang" != "xno"], [