Make sure autogen.sh works somewhat on a Mac.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5e2edca8bd8736a26ecea318daac6b07a29b4b05..619f23e1756a72b3e60c884f3498c104265831ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -72,12 +72,6 @@ AS_CASE([$apr_found], [yes], [
        AC_LIB_APPENDTOVAR([CPPFLAGS], [`$apr_config --includes`])
        AC_SUBST([LTLIBAPR], [`$apr_config --link-libtool`])
 ], [AC_MSG_ERROR([You need apr])])
-VL_LIB_READLINE
-AS_CASE([$vl_cv_lib_readline], [no], [AC_MSG_ERROR([You need readline])])
-AC_LANG_PUSH([C])
-AM_ICONV
-AC_LANG_POP([C])
-AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
 AC_DEFUN([CY_CHECK_JAVASCRIPTCORE], [
        PKG_CHECK_MODULES([WEBKIT], [webkit-1.0], [
                CY_EXECUTE=1
@@ -108,20 +102,22 @@ AC_ARG_ENABLE([javascript], [AS_HELP_STRING(
                CY_CHECK_JAVASCRIPTCORE
        ], [AC_MSG_ERROR([Unknown JavaScript engine: $enableval])])
 ], [CY_CHECK_JAVASCRIPT])
-AS_CASE([$CY_EXECUTE], [1], [
-       AC_SUBST([CY_EXECUTE])
+AC_DEFUN([CY_CHECK_PKG_CONFIG_LIBFFI], [
        PKG_CHECK_MODULES([LIBFFI], [libffi], [
                AC_LIB_APPENDTOVAR([CXXFLAGS], [`$PKG_CONFIG --cflags libffi`])
                AC_LIB_APPENDTOVAR([LIBS], [`$PKG_CONFIG --libs libffi`])
        ], [
-               AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
-               AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
-                       AC_MSG_ERROR([You need libffi])
-               ])
+               AC_MSG_ERROR([You need libffi])
+       ])
+])
+AS_CASE([$CY_EXECUTE], [1], [
+       AC_SUBST([CY_EXECUTE])
+       AC_CHECK_HEADERS([ffi.h ffi/ffi.h], [break])
+       AS_IF([test "x$ac_cv_header_ffi_h" = xno && test "x$ac_cv_header_ffi_ffi_h" = xno], [
+               CY_CHECK_PKG_CONFIG_LIBFFI
+       ], [
                AC_SEARCH_LIBS([ffi_call], [ffi])
-               AS_CASE([$ac_cv_search_ffi_call], [no], [
-                       AC_MSG_ERROR([You need libffi])
-               ])
+               AS_CASE([$ac_cv_search_ffi_call], [no], [CY_CHECK_PKG_CONFIG_LIBFFI])
        ])
        AC_LANG_PUSH([Objective C++])
        AC_MSG_CHECKING([if we really have Objective C++])
@@ -154,6 +150,26 @@ AS_CASE([$CY_EXECUTE], [1], [
        ])
        AC_LANG_POP([Objective C++])
 ])
+VL_LIB_READLINE
+AS_CASE([$vl_cv_lib_readline], [no], [AC_MSG_ERROR([You need readline])])
+AC_LANG_PUSH([C])
+AM_ICONV
+AS_CASE([$am_cv_func_iconv], [yes], [], [
+       for cy_iconv_prefix_arg in $CFLAGS $CXXFLAGS $OBJCXXFLAGS $LDFLAGS $LIBS; do
+               AS_CASE([$cy_iconv_prefix_arg], [-I*], [
+                       AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-I//;s|/include$||'`])
+               ], [-L*], [
+                       AC_LIB_APPENDTOVAR([cy_iconv_prefixes], [`echo $cy_iconv_prefix_arg | sed -e 's/^-L//;s|/lib$||'`])
+               ])
+       done
+       for with_libiconv_prefix in $cy_iconv_prefixes; do
+               AS_UNSET([am_cv_func_iconv])
+               AM_ICONV_LINKFLAGS_BODY
+               AM_ICONV
+       done
+])
+AS_CASE([$am_cv_func_iconv], [yes], [], [AC_MSG_ERROR([You need iconv])])
+AC_LANG_POP([C])
 AS_IF([test "x$CY_OBJECTIVEC" = x1], [
        AC_CHECK_HEADER([mach/mach.h], [
                AS_CASE([$OTOOL], [:], [AC_MSG_WARN([Missing otool?])], [AC_SUBST([CY_OBJECTIVEC_MACH], [1])])