Fix OBJCCXXFLAGS to OBJCXXFLAGS, removing extra C.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1eecf5bdf7b91ab37bed0a7566b6ede4734352ac..a900ad70794d862cba5f21b64d56edea32128a09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -104,18 +104,26 @@ AC_DEFUN([CY_TRY], [
 AC_DEFUN([CY_COMPILE_FLAG], [
     AC_LIB_APPENDTOVAR([CFLAGS], ]$1[)
     AC_LIB_APPENDTOVAR([CXXFLAGS], ]$1[)
-    AC_LIB_APPENDTOVAR([OBJCCXXFLAGS], ]$1[)
+    AC_LIB_APPENDTOVAR([OBJCXXFLAGS], ]$1[)
 ])
 
-AC_DEFUN([CY_TEST_FLAG], [
-    AC_MSG_CHECKING([for ]]$1[)
-    CY_TRY([CXXFLAGS], $1, [
+AC_DEFUN([CY_TEST_FLAG_], [
+    AC_LANG_PUSH(]$2[)
+    AC_MSG_CHECKING([for ]]$4[[ ]]$1[)
+    CY_TRY(]$3[, $1, [
         AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],
             [CY_SUCCESS], [CY_FAILURE])
     ], [
         AC_MSG_RESULT([yes])
-        CY_COMPILE_FLAG($1)
+        AC_LIB_APPENDTOVAR(]$3[, ]$1[)
     ], [AC_MSG_RESULT([no])])
+    AC_LANG_POP(]$2[)
+])
+
+AC_DEFUN([CY_TEST_FLAG], [
+    CY_TEST_FLAG_(]$1[, [C], [CFLAGS], [cc])
+    CY_TEST_FLAG_(]$1[, [C++], [CXXFLAGS], [c++])
+    CY_TEST_FLAG_(]$1[, [Objective C++], [OBJCXXFLAGS], [c++ -ObjC])
 ])
 
 AX_CFLAGS_WARN_ALL
@@ -138,6 +146,15 @@ done
 AC_SUBST([CY_ARCH])
 dnl }}}
 
+AC_DEFUN([CY_LT_LIB], [
+    cy_save=$LIBS
+    LIBS=
+    ]$2[
+    ]$1[=$LIBS
+    LIBS=$cy_save
+    AC_SUBST(]$1[)
+])
+
 dnl --with-frameworks {{{
 AC_ARG_WITH([frameworks], [AS_HELP_STRING(
     [--with-frameworks=DIRS],
@@ -203,12 +220,13 @@ AM_CONDITIONAL([CY_EXECUTE], [test "x$CY_EXECUTE" = x1])
 
 AS_CASE([$CY_EXECUTE], [1], [
     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_LT_LIB([LTLIBFFI], 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], [CY_CHECK_PKG_CONFIG_LIBFFI])
-    ])
+    ]))
 
     AC_LANG_PUSH([Objective C++])
 
@@ -248,15 +266,6 @@ AS_CASE([$CY_EXECUTE], [1], [
 
 AM_CONDITIONAL([CY_OBJECTIVEC], [test "x$CY_OBJECTIVEC" = x1])
 
-AC_DEFUN([CY_LT_LIB], [
-    cy_save=$LIBS
-    LIBS=
-    ]$2[
-    ]$1[=$LIBS
-    LIBS=$cy_save
-    AC_SUBST(]$1[)
-])
-
 CY_LT_LIB([LTLIBREADLINE], [AX_LIB_READLINE])
 AS_CASE([$ax_cv_lib_readline], [no], [AC_MSG_ERROR([missing "libreadline"])])