Fix lexer hack correctness check when more spaces.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 929444959f9bde2240a8ab92297690a8a5293fc4..a8ef86bb20859147ca55fb628775bb18622bf882 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Cycript - Optimizing JavaScript Compiler/Runtime
-dnl Copyright (C) 2009-2014  Jay Freeman (saurik)
+dnl Copyright (C) 2009-2015  Jay Freeman (saurik)
 
 dnl GNU Affero General Public License, Version 3 {{{
 dnl
@@ -19,7 +19,7 @@ dnl }}}
 
 AC_PREREQ([2.65])
 AC_INIT([Cycript], [0.9], [saurik@saurik.com], [cycript], [http://www.cycript.org/])
-AC_COPYRIGHT([Copyright (C) 2009-2014  Jay Freeman (saurik)])
+AC_COPYRIGHT([Copyright (C) 2009-2015  Jay Freeman (saurik)])
 
 AC_CONFIG_SRCDIR([Console.cpp])
 AC_CONFIG_AUX_DIR([.])
@@ -40,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])
@@ -70,7 +73,7 @@ AC_DEFUN([CY_CHECK_PROGS_VERSION], [
 ]) dnl }}}
 
 CY_CHECK_PROGS_VERSION([BISON], [bison], [GNU Project parser generator (yacc replacement)],
-    [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [2.3])
+    [-V | $SED -e '1 s/^bison (GNU Bison) \(.*\)$/\1/p;d'], [3.0])
 CY_CHECK_PROGS_VERSION([FLEX], [flex], [the fast lexical analyser generator],
     [--version | $SED -e '1 s/^@<:@^0-9.@:>@* \(@<:@0-9.@:>@*\).*$/\1/p;d'], [2.5.33])
 CY_CHECK_PROGS_VERSION([GPERF], [gperf], [perfect hash function generator],
@@ -78,19 +81,6 @@ CY_CHECK_PROGS_VERSION([GPERF], [gperf], [perfect hash function generator],
 CY_CHECK_PROGS_VERSION([GNUTAR], [tar gtar gnutar], [a very sticky lump of files],
     [--version | $SED -e '1 s/^tar (GNU tar) \(.*\)$/\1/p;d'], [1.19])
 
-AC_MSG_CHECKING([bison for %code{}])
-echo '%code{}%%_:' >conftest.y
-if $BISON conftest.y -o/dev/null 2>/dev/null; then
-    AC_LIB_APPENDTOVAR([CY_FILTERS], [Bison24])
-    AC_MSG_RESULT([yes])
-else
-    AC_LIB_APPENDTOVAR([CY_FILTERS], [Bison23])
-    AC_MSG_RESULT([no])
-fi
-
-rm -f conftest.y
-AC_SUBST([CY_FILTERS])
-
 dnl CY_TRY {{{
 AC_DEFUN([CY_SUCCESS], [cy_good=1])
 AC_DEFUN([CY_FAILURE], [cy_good=0])
@@ -132,10 +122,14 @@ 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-empty-body])
 CY_TEST_FLAG([-Wno-overloaded-virtual])
 CY_TEST_FLAG([-Wno-parentheses])
+CY_TEST_FLAG([-Wno-tautological-undefined-compare])
 CY_TEST_FLAG([-Wno-unneeded-internal-declaration])
 
+AX_PTHREAD
+
 AC_DEFUN([CY_LT_LIB], [
     cy_save=$LIBS
     LIBS=
@@ -145,19 +139,6 @@ AC_DEFUN([CY_LT_LIB], [
     AC_SUBST(]$1[)
 ])
 
-dnl -arch * {{{
-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])
-    ], [
-        AC_MSG_RESULT([yes])
-        AC_LIB_APPENDTOVAR([CY_ARCH], ["-arch $cy_arch"])
-    ], [AC_MSG_RESULT([no])])
-done
-AC_SUBST([CY_ARCH])
-dnl }}}
-
 dnl --enable-javascript {{{
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [
@@ -169,7 +150,7 @@ AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
     ], [
         AC_SUBST([CY_EXECUTE], [1])
     ], [
-        for cy_webkit_pkg in "webkit-1.0" "WebKitGtk"; do
+        for cy_webkit_pkg in "javascriptcoregtk-4.0"; do
             PKG_CHECK_MODULES([WEBKIT], [$cy_webkit_pkg], [
                 AC_SUBST([CY_EXECUTE], [1])
                 AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags $cy_webkit_pkg`])
@@ -200,6 +181,9 @@ dnl }}}
 AC_ARG_ENABLE([console], AS_HELP_STRING([--disable-console], [disable console]))
 AM_CONDITIONAL([CY_CONSOLE], [test "x$enable_console" != "xno"])
 
+AC_ARG_ENABLE([attach], AS_HELP_STRING([--disable-attach], [disable attach]))
+AM_CONDITIONAL([CY_ATTACH], [test "x$enable_attach" != "xno" -a "x$CY_EXECUTE" = x1])
+
 AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
     PKG_CHECK_MODULES([LIBFFI], [libffi], [
         AC_LIB_APPENDTOVAR([CPPFLAGS], [`$PKG_CONFIG --cflags libffi`])
@@ -218,13 +202,17 @@ AS_CASE([$CY_EXECUTE], [1], [
         AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
     ]))
 
-    AC_CHECK_HEADER([jni.h], [
+    AC_CHECK_FRAMEWORK([JavaVM], [
+        #include <JavaVM/jni.h>
+    ], [JNI_GetCreatedJavaVMs(NULL, 0, NULL);], [
+        AC_SUBST([CY_JAVA], [1])
+    ], [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++])
 
@@ -271,14 +259,5 @@ AC_SUBST([LTLIBGCC])
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])
 
-AS_IF([test "x$CY_EXECUTE" = x1], [
-    AC_CHECK_HEADER([mach/mach.h], [
-        AC_CHECK_TOOLS([_LIPO], [lipo], [AC_MSG_ERROR([missing "lipo"])])
-        AC_CHECK_TOOLS([_NM], [nm], [AC_MSG_ERROR([missing "nm"])])
-        AC_CHECK_TOOLS([_OTOOL], [otool], [AC_MSG_ERROR([missing "otool"])])
-        AC_SUBST([CY_ATTACH_GROUP], [procmod])
-        AC_SUBST([CY_MACH], [1])])])
-AM_CONDITIONAL([CY_MACH], [test "x$CY_MACH" = x1])
-
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT