Fix OBJCCXXFLAGS to OBJCXXFLAGS, removing extra C.

[cycript.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9bd07547870963a36896422c651de79c4ab46add..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