X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/002ca3d9a8ba4f323999811405efcc2e3e390fd7..55c63f1de4cd63a773c55b06499c2c827bfbd14f:/configure.ac diff --git a/configure.ac b/configure.ac index 1115adf..f890dd4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,25 +1,25 @@ dnl Cycript - Optimizing JavaScript Compiler/Runtime -dnl Copyright (C) 2009-2013 Jay Freeman (saurik) +dnl Copyright (C) 2009-2014 Jay Freeman (saurik) -dnl GNU General Public License, Version 3 {{{ +dnl GNU Affero General Public License, Version 3 {{{ dnl -dnl Cycript is free software: you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published -dnl by the Free Software Foundation, either version 3 of the License, -dnl or (at your option) any later version. +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU Affero General Public License as published by +dnl the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. dnl -dnl Cycript is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. +dnl GNU Affero General Public License for more details. dnl -dnl You should have received a copy of the GNU General Public License -dnl along with Cycript. If not, see . +dnl You should have received a copy of the GNU Affero General Public License +dnl along with this program. If not, see . dnl }}} AC_PREREQ([2.65]) AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/]) -AC_COPYRIGHT([Copyright (C) 2009-2012 Jay Freeman (saurik)]) +AC_COPYRIGHT([Copyright (C) 2009-2014 Jay Freeman (saurik)]) AC_CONFIG_SRCDIR([Console.cpp]) AC_CONFIG_AUX_DIR([.]) @@ -29,11 +29,6 @@ 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 @@ -45,6 +40,9 @@ LT_INIT([disable-static]) AC_LANG([C++]) +AX_CXX_COMPILE_STDCXX_11([ext], [mandatory]) +OBJCXXFLAGS="${OBJCXXFLAGS} ${CXXFLAGS##*' '}" + PKG_PROG_PKG_CONFIG([0.22]) AC_PATH_PROG([GIT], [git]) @@ -141,8 +139,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]) @@ -153,29 +160,12 @@ 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_XCODE_MACOSXSDK], [`xcodebuild -sdk macosx -version Path`]) - AC_SUBST([CY_XCODE_IOSSIMSDK], [`xcodebuild -sdk iphonesimulator -version Path`]) -]) - -AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_XCODE_IOSSIMSDK" != 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], [ - CY_LT_LIB([LTJAVASCRIPTCORE], [AC_CHECK_FRAMEWORK([JavaScriptCore], [ + CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [ + AC_SUBST([CY_EXECUTE], [1]) + ], [AC_CHECK_FRAMEWORK([JavaScriptCore], [ #include ], [ JSEvaluateScript(0, 0, 0, 0, 0, 0); @@ -189,7 +179,7 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [ AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs $cy_webkit_pkg`]) ], [:]); if test "x$CY_EXECUTE" = x1; then break; fi done - ])]) + ])])]) ]) AC_DEFUN([CY_CHECK_JAVASCRIPT], [ @@ -213,22 +203,6 @@ 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 {{{ -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"]) -])]) -dnl }}} -]) - AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [ PKG_CHECK_MODULES([LIBFFI], [libffi], [ AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags libffi`]) @@ -247,6 +221,14 @@ AS_CASE([$CY_EXECUTE], [1], [ AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI]) ])) + AC_CHECK_HEADER([jni.h], [ + AC_SUBST([CY_JAVA], [1]) + CY_LT_LIB([LTJAVA], [AC_SEARCH_LIBS([JNI_GetCreatedJavaVMs], [dvm], [ + ])]) + ], [ + AC_SUBST([CY_JAVA], [0]) + ]) + AC_LANG_PUSH([Objective C++]) AC_MSG_CHECKING([if we really have Objective C++]) @@ -279,6 +261,7 @@ AS_CASE([$CY_EXECUTE], [1], [ AC_LANG_POP([Objective C++]) ]) +AM_CONDITIONAL([CY_JAVA], [test "x$CY_JAVA" = x1]) AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1]) CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE]) @@ -286,6 +269,8 @@ AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])]) CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap ncurses])]) +AC_SUBST([LTLIBGCC]) + AC_SUBST([LTFLAGS]) AC_SUBST([SO], [$acl_shlibext])