X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/142cb9e3c2eaba94e04b43f66178f5c4439bd1a8..4dd55d2fafdf8e8c93d16023f4d09de533113557:/configure.ac diff --git a/configure.ac b/configure.ac index 0bd641e..4c5d65c 100644 --- a/configure.ac +++ b/configure.ac @@ -29,11 +29,7 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_MAINTAINER_MODE([disable]) -dnl XXX: do this only on Mac OS X -am_cv_CC_dependencies_compiler_type=none -am_cv_CXX_dependencies_compiler_type=none -am_cv_OBJCXX_dependencies_compiler_type=none - +AC_PROG_CC AC_PROG_CXX AC_PROG_OBJCXX @@ -140,8 +136,17 @@ CY_TEST_FLAG([-Wno-overloaded-virtual]) CY_TEST_FLAG([-Wno-parentheses]) CY_TEST_FLAG([-Wno-unneeded-internal-declaration]) +AC_DEFUN([CY_LT_LIB], [ + cy_save=$LIBS + LIBS= + ]$2[ + ]$1[=$LIBS + LIBS=$cy_save + AC_SUBST(]$1[) +]) + dnl -arch * {{{ -for cy_arch in ppc ppc64 i386 x86_64 armv6; do +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]) @@ -152,24 +157,6 @@ for cy_arch in ppc ppc64 i386 x86_64 armv6; do done AC_SUBST([CY_ARCH]) dnl }}} -dnl iOS SDK {{{ -AC_PATH_PROG([XCODEBUILD], [xcodebuild]) - -AS_IF([test "x$XCODEBUILD" != x], [ - AC_SUBST([CY_IOS_SIMULATOR], [`xcodebuild -sdk iphonesimulator -version Path`]) -]) - -AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_IOS_SIMULATOR" != x]) -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], [ @@ -208,14 +195,24 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING( ], [CY_CHECK_JAVASCRIPT]) dnl }}} +AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console])) +AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"]) + +AM_COND_IF([CY_CONSOLE], [ dnl APR_FIND_APR {{{ -APR_FIND_APR([], [], [1], [1]) +AS_IF([test "x$LTLIBAPR" != x], [ + AC_SUBST([LTLIBAPR]) +], [ + APR_FIND_APR([], [], [1], [1]) AS_CASE([$apr_found], [yes], [ AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`]) AC_LIB_APPENDTOVAR([LTLIBAPR], [`$apr_config --link-libtool`]) AC_SUBST([LTLIBAPR]) -], [AC_MSG_ERROR([missing "libapr"])]) +], [ + AC_MSG_ERROR([missing "libapr"]) +])]) dnl }}} +]) AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [ PKG_CHECK_MODULES([LIBFFI], [libffi], [ @@ -272,7 +269,9 @@ AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1]) CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE]) AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])]) -CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap])]) +CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap ncurses])]) + +AC_SUBST([LTLIBGCC]) AC_SUBST([LTFLAGS]) AC_SUBST([SO], [$acl_shlibext])