Manually unify CYLocal<CYPool>::key_ into Library.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 201f626f58a75460a30ea9f3880430ae659472be..382ddf0b7da86067b209172d7e1088a8731284a4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -150,9 +145,24 @@ 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_CHECK_FRAMEWORK([JavaScriptCore], [
+    CY_LT_LIB([LTJAVASCRIPTCORE], [AC_SEARCH_LIBS([JSEvaluateScript], [JavaScriptCore], [
+        AC_SUBST([CY_EXECUTE], [1])
+    ], [AC_CHECK_FRAMEWORK([JavaScriptCore], [
         #include <JavaScriptCore/JSBase.h>
     ], [
         JSEvaluateScript(0, 0, 0, 0, 0, 0);
@@ -166,7 +176,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], [
@@ -190,22 +200,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`])
@@ -263,6 +257,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])