Add macosx.sh and readline.sh for Mac OS X.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 90f2f5c2a0cf2d00c17ad7c6098ef159455a2d2f..ed3093087a554d718caa5532aaf8db8019b4f77c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,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])
@@ -153,10 +156,11 @@ dnl iOS SDK {{{
 AC_PATH_PROG([XCODEBUILD], [xcodebuild])
 
 AS_IF([test "x$XCODEBUILD" != x], [
-    AC_SUBST([CY_IOS_SIMULATOR], [`xcodebuild -sdk iphonesimulator -version Path`])
+    AC_SUBST([CY_XCODE_MACOSXSDK], [`xcodebuild -sdk macosx -version Path`])
+    AC_SUBST([CY_XCODE_IOSSIMSDK], [`xcodebuild -sdk iphonesimulator -version Path`])
 ])
 
-AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_IOS_SIMULATOR" != x])
+AM_CONDITIONAL([CY_IOS_SIMULATOR], [test "x$CY_XCODE_IOSSIMSDK" != x])
 dnl }}}
 
 AC_DEFUN([CY_LT_LIB], [
@@ -271,11 +275,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])