Replace iconv with some code from "official" code.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e1a13bbc3f50de14786706a8ba6de8bed49a425f..0bd641e6047d1eca821da1edc02ecd291663a44e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,16 @@ AC_CONFIG_MACRO_DIR([m4])
 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_CXX
 AC_PROG_OBJCXX
+
 AM_PROG_AR
 AC_PROG_INSTALL
 
@@ -121,6 +128,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])
@@ -142,6 +152,15 @@ 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_IOS_SIMULATOR], [`xcodebuild -sdk iphonesimulator -version Path`])
+])
+
+AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_IOS_SIMULATOR" != x])
+dnl }}}
 
 AC_DEFUN([CY_LT_LIB], [
     cy_save=$LIBS
@@ -154,7 +173,7 @@ AC_DEFUN([CY_LT_LIB], [
 
 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);
@@ -168,7 +187,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], [
@@ -225,7 +244,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])
@@ -233,10 +252,6 @@ AS_CASE([$CY_EXECUTE], [1], [
             AC_CHECK_FRAMEWORK([Foundation], [
                 #include <Foundation/NSObject.h>
             ], [[[[NSObject alloc] init];]])
-
-            AC_CHECK_FRAMEWORK([WebKit], [
-                #include <WebKit/WebScriptObject.h>
-            ], [[[[WebScriptObject alloc] init];]])
         ], [
             AC_ARG_VAR([GNUSTEP_CONFIG], [prints information about the current gnustep installation])
             AC_CHECK_PROGS([GNUSTEP_CONFIG], [gnustep-config])
@@ -246,7 +261,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++])
@@ -259,11 +274,6 @@ AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])
 
 CY_LT_LIB([LTLIBTERMCAP], [AC_SEARCH_LIBS([cur_term], [termcap])])
 
-AC_LANG_PUSH([C])
-AM_ICONV
-AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([missing "libiconv"])])
-AC_LANG_POP([C])
-
 AC_SUBST([LTFLAGS])
 AC_SUBST([SO], [$acl_shlibext])