Allow APR link flags to be configure overridden.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 492961719da5c8e24aa74fba97b3c56615f0446f..e668c46e114e731a439a2c91987d6e57e2fdde5f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ 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
 
@@ -128,6 +129,7 @@ AC_DEFUN([CY_TEST_FLAG], [
 
 AX_CFLAGS_WARN_ALL
 AX_CXXFLAGS_WARN_ALL
+AX_FLAGS_WARN_ALL
 
 CY_TEST_FLAG([-Werror])
 
@@ -155,10 +157,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], [
@@ -208,12 +211,17 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING(
 dnl }}}
 
 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], [
@@ -273,11 +281,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])