am_cv_CXX_dependencies_compiler_type=none
am_cv_OBJCXX_dependencies_compiler_type=none
+AC_PROG_CC
AC_PROG_CXX
AC_PROG_OBJCXX
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], [
], [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], [
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_SUBST([LTFLAGS])
AC_SUBST([SO], [$acl_shlibext])