X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/4a5b14f83554f6552c1a416b878bb3f091113fb2..8f41509fd52c574f447fe0e40555530de3fda431:/configure.ac?ds=inline

diff --git a/configure.ac b/configure.ac
index 85a68e4..4c5d65c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,10 @@ 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
 
@@ -122,6 +124,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])
@@ -131,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])
@@ -144,18 +158,9 @@ 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_CHECK_FRAMEWORK([JavaScriptCore], [
         #include <JavaScriptCore/JSBase.h>
     ], [
         JSEvaluateScript(0, 0, 0, 0, 0, 0);
@@ -169,7 +174,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,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], [
@@ -226,7 +241,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 <CoreFoundation/CFBase.h>
         ], [CFAllocatorGetDefault();], [
             AC_SUBST([CY_OBJECTIVEC])
@@ -243,7 +258,7 @@ 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++])
@@ -254,12 +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_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])