X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/7341eedbaf526ef2f0986b576c656906050e270a..HEAD:/configure

diff --git a/configure b/configure
index 8f9f3d8..a48336f 100755
--- a/configure
+++ b/configure
@@ -644,6 +644,9 @@ LTLIBGCC
 LTLIBTERMCAP
 LTLIBREADLINE
 CY_LIBCLANG
+CY_ANDROID_FALSE
+CY_ANDROID_TRUE
+CY_ANDROID
 CY_OBJECTIVEC_FALSE
 CY_OBJECTIVEC_TRUE
 CY_PYTHON_FALSE
@@ -22670,7 +22673,7 @@ return sqlite3_open_v2 ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' sqlite3; do
+for ac_lib in '' sqlite3 sqlite; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -23126,63 +23129,6 @@ if test "x$ac_cv_header_jni_h" = xyes; then :
 
         CY_JAVA=1
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing JNI_GetCreatedJavaVMs" >&5
-$as_echo_n "checking for library containing JNI_GetCreatedJavaVMs... " >&6; }
-if ${ac_cv_search_JNI_GetCreatedJavaVMs+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char JNI_GetCreatedJavaVMs ();
-int
-main ()
-{
-return JNI_GetCreatedJavaVMs ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dvm; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_search_JNI_GetCreatedJavaVMs=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_JNI_GetCreatedJavaVMs+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_JNI_GetCreatedJavaVMs+:} false; then :
-
-else
-  ac_cv_search_JNI_GetCreatedJavaVMs=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_JNI_GetCreatedJavaVMs" >&5
-$as_echo "$ac_cv_search_JNI_GetCreatedJavaVMs" >&6; }
-ac_res=$ac_cv_search_JNI_GetCreatedJavaVMs
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-
-fi
-
 
 else
 
@@ -23791,6 +23737,7 @@ $as_echo "$ac_cv_framework_CoreFoundation" >&6; }
   done
 
 
+            CY_OBJECTIVEC=1
 
 
 
@@ -23911,6 +23858,7 @@ done
 
             if test "x$GNUSTEP_CONFIG" != x; then :
 
+                CY_OBJECTIVEC=1
 
 
   for element in `$GNUSTEP_CONFIG --objc-flags`; do
@@ -23970,6 +23918,11 @@ fi
 
 
 
+else
+
+        CY_OBJECTIVEC=0
+
+
 fi
 
     ac_ext=cpp
@@ -24016,6 +23969,36 @@ else
 fi
 
 
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifndef __ANDROID__
+#error
+#endif
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+    CY_ANDROID=1
+
+
+else
+
+    CY_ANDROID=0
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test "x$CY_ANDROID" = x1; then
+  CY_ANDROID_TRUE=
+  CY_ANDROID_FALSE='#'
+else
+  CY_ANDROID_TRUE='#'
+  CY_ANDROID_FALSE=
+fi
+
+
 
 # Check whether --with-libclang was given.
 if test "${with_libclang+set}" = set; then :
@@ -24438,6 +24421,10 @@ if test -z "${CY_OBJECTIVEC_TRUE}" && test -z "${CY_OBJECTIVEC_FALSE}"; then
   as_fn_error $? "conditional \"CY_OBJECTIVEC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CY_ANDROID_TRUE}" && test -z "${CY_ANDROID_FALSE}"; then
+  as_fn_error $? "conditional \"CY_ANDROID\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CY_PRELINK_TRUE}" && test -z "${CY_PRELINK_FALSE}"; then
   as_fn_error $? "conditional \"CY_PRELINK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5