X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/1f11d1b4c16ac2de63f38820bf725b91fc360522..c10a2228f414e5c537ad57935b9ac7c0287b2f9d:/configure.ac

diff --git a/configure.ac b/configure.ac
index 709043c..82821d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_COPYRIGHT([Copyright (C) 2009-2012  Jay Freeman (saurik)])
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
@@ -103,23 +104,35 @@ AC_DEFUN([CY_TRY], [
 AC_DEFUN([CY_COMPILE_FLAG], [
     AC_LIB_APPENDTOVAR([CFLAGS], ]$1[)
     AC_LIB_APPENDTOVAR([CXXFLAGS], ]$1[)
-    AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], ]$1[)
+    AC_LIB_APPENDTOVAR([OBJCXXFLAGS], ]$1[)
 ])
 
-AC_DEFUN([CY_TEST_FLAG], [
-    AC_MSG_CHECKING([for ]]$1[)
-    CY_TRY([CXXFLAGS], $1, [
+AC_DEFUN([CY_TEST_FLAG_], [
+    AC_LANG_PUSH(]$2[)
+    AC_MSG_CHECKING([for ]]$4[[ ]]$1[)
+    CY_TRY(]$3[, $1, [
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
             [CY_SUCCESS], [CY_FAILURE])
     ], [
         AC_MSG_RESULT([yes])
-        CY_COMPILE_FLAG($1)
+        AC_LIB_APPENDTOVAR(]$3[, ]$1[)
     ], [AC_MSG_RESULT([no])])
+    AC_LANG_POP(]$2[)
+])
+
+AC_DEFUN([CY_TEST_FLAG], [
+    CY_TEST_FLAG_(]$1[, [C], [CFLAGS], [cc])
+    CY_TEST_FLAG_(]$1[, [C++], [CXXFLAGS], [c++])
+    CY_TEST_FLAG_(]$1[, [Objective C++], [OBJCXXFLAGS], [c++ -ObjC])
 ])
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL
 
+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-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
@@ -137,15 +150,15 @@ done
 AC_SUBST([CY_ARCH])
 dnl }}}
 
-dnl --with-frameworks {{{
-AC_ARG_WITH([frameworks], [AS_HELP_STRING(
-    [--with-frameworks=DIRS],
-    [add to DIRS (space separated) to the Darwin include path for frameworks with -F]
-)], [
-    for cy_framework in $withval; do
-        CY_COMPILE_FLAG([-F$cy_framework])
-    done
-]) dnl }}}
+AC_DEFUN([CY_LT_LIB], [
+    cy_save=$LIBS
+    LIBS=
+    ]$2[
+    ]$1[=$LIBS
+    LIBS=$cy_save
+    AC_SUBST(]$1[)
+])
+
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     AC_CHECK_FRAMEWORK([JavaScriptCore], [
@@ -202,12 +215,13 @@ AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
 AS_CASE([$CY_EXECUTE], [1], [
     AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
-    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_LANG_PUSH([Objective C++])
 
@@ -247,15 +261,6 @@ AS_CASE([$CY_EXECUTE], [1], [
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 
-AC_DEFUN([CY_LT_LIB], [
-    cy_save=$LIBS
-    LIBS=
-    ]$2[
-    ]$1[=$LIBS
-    LIBS=$cy_save
-    AC_SUBST(]$1[)
-])
-
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])