X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/1f11d1b4c16ac2de63f38820bf725b91fc360522..5a288ada2a3af85f0e1f3d8963911716eef7f290:/configure.ac diff --git a/configure.ac b/configure.ac index 709043c..a900ad7 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,18 +104,26 @@ 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 @@ -137,6 +146,15 @@ done AC_SUBST([CY_ARCH]) dnl }}} +AC_DEFUN([CY_LT_LIB], [ + cy_save=$LIBS + LIBS= + ]$2[ + ]$1[=$LIBS + LIBS=$cy_save + AC_SUBST(]$1[) +]) + dnl --with-frameworks {{{ AC_ARG_WITH([frameworks], [AS_HELP_STRING( [--with-frameworks=DIRS], @@ -202,12 +220,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 +266,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"])])