Merge adapter into callback, removing indirection.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a423a9900509d1ec337759a79b9fe46be35a0b32..b9dc7f82b25f95a74a855afa8f7c50057ac6f31d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Cycript - Optimizing JavaScript Compiler/Runtime
-dnl Copyright (C) 2009-2014  Jay Freeman (saurik)
+dnl Copyright (C) 2009-2015  Jay Freeman (saurik)
 
 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_COPYRIGHT([Copyright (C) 2009-2014  Jay Freeman (saurik)])
+AC_COPYRIGHT([Copyright (C) 2009-2015  Jay Freeman (saurik)])
 
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
@@ -122,8 +122,10 @@ dnl XXX: this is used to support GNU Objective-C struct objc_method
 CY_TEST_FLAG([-Wno-deprecated-declarations])
 
 CY_TEST_FLAG([-Wno-dangling-else])
+CY_TEST_FLAG([-Wno-empty-body])
 CY_TEST_FLAG([-Wno-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
+CY_TEST_FLAG([-Wno-tautological-undefined-compare])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
 AX_PTHREAD
@@ -137,19 +139,6 @@ AC_DEFUN([CY_LT_LIB], [
     AC_SUBST(]$1[)
 ])
 
-dnl -arch * {{{
-for cy_arch in ppc ppc64 i386 x86_64 armv6 arm64; do
-    AC_MSG_CHECKING([for -arch $cy_arch])
-    CY_TRY([CXXFLAGS], ["-arch $cy_arch"], [
-        AC_TRY_LINK([], [], [CY_SUCCESS], [CY_FAILURE])
-    ], [
-        AC_MSG_RESULT([yes])
-        AC_LIB_APPENDTOVAR([CY_ARCH], ["-arch $cy_arch"])
-    ], [AC_MSG_RESULT([no])])
-done
-AC_SUBST([CY_ARCH])
-dnl }}}
-
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [
@@ -192,6 +181,9 @@ dnl }}}
 AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
 AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
 
+AC_ARG_ENABLE([attach], AS_HELP_STRING([--disable-attach], [disable attach]))
+AM_CONDITIONAL([CY_ATTACH], [test "x$enable_attach" != "xno" -a "x$CY_EXECUTE" = x1])
+
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
         AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags libffi`])
@@ -263,14 +255,5 @@ AC_SUBST([LTLIBGCC])
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])
 
-AS_IF([test "x$CY_EXECUTE" = x1], [
-    AC_CHECK_HEADER([mach/mach.h], [
-        AC_CHECK_TOOLS([_LIPO], [lipo], [AC_MSG_ERROR([missing "lipo"])])
-        AC_CHECK_TOOLS([_NM], [nm], [AC_MSG_ERROR([missing "nm"])])
-        AC_CHECK_TOOLS([_OTOOL], [otool], [AC_MSG_ERROR([missing "otool"])])
-        AC_SUBST([CY_ATTACH_GROUP], [procmod])
-        AC_SUBST([CY_MACH], [1])])])
-AM_CONDITIONAL([CY_MACH], [test "x$CY_MACH" = x1])
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT