Do not output an empty comment for an empty stack.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f39e089e0d91e55239289a554226ceb07a7a5036..84756bcd2cb06dda88791cae6e0b070f80d50153 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-dnl Cycript - Optimizing JavaScript Compiler/Runtime
-dnl Copyright (C) 2009-2015  Jay Freeman (saurik)
+dnl Cycript - The Truly Universal Scripting Language
+dnl Copyright (C) 2009-2016  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-2015  Jay Freeman (saurik)])
+AC_COPYRIGHT([Copyright (C) 2009-2016  Jay Freeman (saurik)])

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


@@ -206,7 +206,7 @@ AS_CASE([$CY_EXECUTE], [1], [
     ])])
 
     CY_LT_LIB([LTLIBSQLITE3], [AC_CHECK_HEADERS([sqlite3.h], [
     ])])
 
     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])
     ])])
 
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])


@@ -219,29 +219,45 @@ AS_CASE([$CY_EXECUTE], [1], [
         AC_CHECK_FUNCS([ffi_prep_cif_var])
     ])])
 
         AC_CHECK_FUNCS([ffi_prep_cif_var])
     ])])
 

-    AC_CHECK_FRAMEWORK([JavaVM], [
+    CY_LT_LIB([LTJAVA], [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])
         #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], [0])

-    ])])
+    ])])])

 
 

-    AC_CHECK_FRAMEWORK([Ruby], [
+    CY_LT_LIB([LTRUBY], [PKG_CHECK_MODULES([LIBRUBY21], [ruby-2.1], [
+        AC_SUBST([CY_RUBY], [1])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags ruby-2.1`])
+        AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs ruby-2.1`])
+    ], [AC_CHECK_FRAMEWORK([Ruby], [

         #include <Ruby/ruby.h>
     ], [ruby_init();], [
         AC_SUBST([CY_RUBY], [1])
     ], [AC_CHECK_HEADERS([ruby.h], [
         AC_SUBST([CY_RUBY], [1])
         #include <Ruby/ruby.h>
     ], [ruby_init();], [
         AC_SUBST([CY_RUBY], [1])
     ], [AC_CHECK_HEADERS([ruby.h], [
         AC_SUBST([CY_RUBY], [1])

-        CY_LT_LIB([LTRUBY], [AC_SEARCH_LIBS([ruby_init], [ruby], [
-        ])])
+        AC_SEARCH_LIBS([ruby_init], [ruby], [
+        ])

     ], [
         AC_SUBST([CY_RUBY], [0])
     ], [
         AC_SUBST([CY_RUBY], [0])

-    ])])
+    ])])])])
+
+    AC_ARG_WITH([python], AS_HELP_STRING([--with-python], [support python (pass the path to python-config)]), [], [with_python=no])
+
+    AS_IF([test "x$with_python" != "xno"], [
+        AC_SUBST([CY_PYTHON], [1])
+        CY_LT_LIB([LTPYTHON], [
+            AC_LIB_APPENDTOVAR([CPPFLAGS], [`$with_python --includes`])
+            AC_LIB_APPENDTOVAR([LIBS], [`$with_python --ldflags`])
+        ])
+    ], [
+        AC_SUBST([CY_PYTHON], [0])
+    ])
+
+    AM_CONDITIONAL([CY_PRELINK], [test "x$with_python" != "xno"])

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


@@ -255,7 +271,7 @@ AS_CASE([$CY_EXECUTE], [1], [
         CY_LT_LIB([LTOBJECTIVEC], [AC_CHECK_FRAMEWORK([CoreFoundation], [
             #include <CoreFoundation/CFBase.h>
         ], [CFAllocatorGetDefault();], [
         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>
 
             AC_CHECK_FRAMEWORK([Foundation], [
                 #include <Foundation/NSObject.h>


@@ -265,11 +281,13 @@ AS_CASE([$CY_EXECUTE], [1], [
             AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
 
             AS_IF([test "x$GNUSTEP_CONFIG" != x], [
             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_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++])
     ])
 
     AC_LANG_POP([Objective C++])


@@ -277,8 +295,21 @@ AS_CASE([$CY_EXECUTE], [1], [
 
 AM_CONDITIONAL([CY_JAVA], [test "x$CY_JAVA" = x1])
 AM_CONDITIONAL([CY_RUBY], [test "x$CY_RUBY" = x1])
 
 AM_CONDITIONAL([CY_JAVA], [test "x$CY_JAVA" = x1])
 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])
 
 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"], [
 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"], [