Logically order type specifier cases in sig/parse.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 88e32309d5896f6ca5308ae819ab6ec6bdeb3507..aee07a593e74ad0852ff0f50cc1c8f7e35d7e2eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,8 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_OBJCXX
 
+AX_PROG_CXX_FOR_BUILD
+
 AM_PROG_AR
 AC_PROG_INSTALL
 
@@ -195,19 +197,27 @@ AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
 
 AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
+if test "x$CY_SYSTEM" = x; then CY_SYSTEM=1; fi
+AC_SUBST([CY_SYSTEM])
+
 AS_CASE([$CY_EXECUTE], [1], [
     CY_LT_LIB([LTLIBUV], [AC_CHECK_HEADERS([uv.h], [
         AC_SEARCH_LIBS([uv_loop_init], [uv])
     ])])
 
+    CY_LT_LIB([LTLIBSQLITE3], [AC_CHECK_HEADERS([sqlite3.h], [
+        AC_SEARCH_LIBS([sqlite3_open_v2], [sqlite3])
+    ])])
+
     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], [
+    CY_LT_LIB([LTLIBFFI], [AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
         CY_CHECK_PKG_CONFIG_LIBFFI
     ], [
         AC_SEARCH_LIBS([ffi_call], [ffi])
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
-    ]))
+        AC_CHECK_FUNCS([ffi_prep_cif_var])
+    ])])
 
     AC_CHECK_FRAMEWORK([JavaVM], [
         #include <JavaVM/jni.h>
@@ -256,6 +266,12 @@ AS_CASE([$CY_EXECUTE], [1], [
 AM_CONDITIONAL([CY_JAVA], [test "x$CY_JAVA" = x1])
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = 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_SUBST([CY_LIBCLANG], ["$with_libclang"])])
+AM_CONDITIONAL([CY_PRELINK], [test "x$with_libclang" != "xno"])
+
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])