Extend the C++ keyword test to include internal GDK headers (#449016).

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 7d85971ee92e917117f9c6153e8bd87f3a8367f9..9bfa3feb0d6c9e3adbef13c79a0c79919151ff5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -142,8 +142,15 @@ dnl
 AC_CHECK_PROGS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
+
 AC_TRY_COMPILE(,[class a { int b; } c;], ,CXX=)
 AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
+
+gtk_save_cxxflags="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -x objective-c++"
+AC_TRY_COMPILE([@interface Foo @end],,OBJC=yes,OBJC=no)
+AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" == "yes")
+CXXFLAGS="$gtk_save_cxxflags"
 AC_LANG_RESTORE
 
 if test "$os_win32" = "yes"; then