X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/0ae6b72e54160c695bf4e0dfcad86510c721feff..511f56b025a791a6f62910bdd2fe01caaaf917c2:/configure.ac?ds=sidebyside
diff --git a/configure.ac b/configure.ac
index e1a13bb..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([.])
@@ -27,9 +27,12 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_MAINTAINER_MODE([disable])
+AC_PROG_CC
AC_PROG_CXX
AC_PROG_OBJCXX
+
AM_PROG_AR
AC_PROG_INSTALL
@@ -37,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])
@@ -121,6 +127,9 @@ AC_DEFUN([CY_TEST_FLAG], [
AX_CFLAGS_WARN_ALL
AX_CXXFLAGS_WARN_ALL
+AX_FLAGS_WARN_ALL
+
+CY_TEST_FLAG([-Werror])
dnl XXX: this is used to support GNU Objective-C struct objc_method
CY_TEST_FLAG([-Wno-deprecated-declarations])
@@ -130,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])
@@ -143,18 +161,11 @@ 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 --enable-javascript {{{
AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
- 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);
@@ -168,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], [
@@ -189,14 +200,8 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING(
], [CY_CHECK_JAVASCRIPT])
dnl }}}
-dnl APR_FIND_APR {{{
-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_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
+AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
PKG_CHECK_MODULES([LIBFFI], [libffi], [
@@ -216,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++])
@@ -225,7 +238,7 @@ AS_CASE([$CY_EXECUTE], [1], [
], [AC_MSG_RESULT([no])])
AS_IF([test "x$CY_OBJECTIVEC" = x1], [
- AC_CHECK_FRAMEWORK([CoreFoundation], [
+ CY_LT_LIB([LTOBJECTIVEC], [AC_CHECK_FRAMEWORK([CoreFoundation], [
#include
], [CFAllocatorGetDefault();], [
AC_SUBST([CY_OBJECTIVEC])
@@ -233,10 +246,6 @@ AS_CASE([$CY_EXECUTE], [1], [
AC_CHECK_FRAMEWORK([Foundation], [
#include
], [[[[NSObject alloc] init];]])
-
- AC_CHECK_FRAMEWORK([WebKit], [
- #include
- ], [[[[WebScriptObject alloc] init];]])
], [
AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation])
AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
@@ -246,23 +255,21 @@ AS_CASE([$CY_EXECUTE], [1], [
AC_LIB_APPENDTOVAR([OBJCXXFLAGS], [`$GNUSTEP_CONFIG --objc-flags`])
AC_LIB_APPENDTOVAR([LIBS], [`$GNUSTEP_CONFIG --base-libs`])
], [AC_SUBST([CY_OBJECTIVEC], [0])])
- ])
+ ])])
])
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])
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_LANG_PUSH([C])
-AM_ICONV
-AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([missing "libiconv"])])
-AC_LANG_POP([C])
+AC_SUBST([LTLIBGCC])
AC_SUBST([LTFLAGS])
AC_SUBST([SO], [$acl_shlibext])