Create test for finding C++ keywords in public header files (#449016).

2007-06-26  Mathias Hasselmann  <mathias.hasselmann@gmx.de>

	* ChangeLog, configure.in, tests/Makefile.am,
	tests/autotestkeywords.cc: Create test for finding
	C++ keywords in public header files (#449016).

svn path=/trunk/; revision=18243

diff --git a/ChangeLog b/ChangeLog
index 49b1b257bdff9b128def16010d65c64eb1eecfc8..5503c2b82109649e03e93f9eb00442a05f917ea2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-26  Mathias Hasselmann  <mathias.hasselmann@gmx.de>
+
+       * ChangeLog, configure.in, tests/Makefile.am, 
+       tests/autotestkeywords.cc: Create test for finding
+       C++ keywords in public header files (#449016).
+
 2007-06-26  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtktooltips.h: remove the deprecation macros for now to fix

diff --git a/configure.in b/configure.in
index c2535501cecd648a42b0a00ce2bc7b1aacedc83e..7d85971ee92e917117f9c6153e8bd87f3a8367f9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -135,6 +135,17 @@ dnl Initialize libtool
 AC_PROG_CC
 AM_DISABLE_STATIC
 
+dnl 
+dnl Check for a working C++ compiler, but do not bail out, if none is found.
+dnl We use this for an automated test for C++ header correctness.
+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" != "")
+AC_LANG_RESTORE
+
 if test "$os_win32" = "yes"; then
   if test x$enable_static = xyes -o x$enable_static = x; then
     AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 582b83f75f58fe7403a08be09ce8200b9f319c2b..6080704e67c032568c4bfdae6bf0102d1b53f32c 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,8 +26,13 @@ endif
 
 TESTS = floatingtest buildertest
 
+if HAVE_CXX
+TESTS += autotestkeywords
+endif
+
 noinst_PROGRAMS =                      \
        autotestfilechooser             \
+       autotestkeywords                \
        floatingtest                    \
        buildertest                     \
        simple                          \
@@ -90,6 +95,8 @@ noinst_PROGRAMS =                     \
        testtooltips                    \
        testvolumebutton
 
+autotestkeywords_SOURCES = autotestkeywords.cc
+
 autotestfilechooser_DEPENDENCIES = $(TEST_DEPS)
 simple_DEPENDENCIES = $(TEST_DEPS)
 floatingtest_DEPENDENCIES = $(TEST_DEPS)

diff --git a/tests/autotestkeywords.cc b/tests/autotestkeywords.cc
new file mode 100644 (file)
index 0000000..c6bac9d
--- /dev/null
+++ b/tests/autotestkeywords.cc
@@ -0,0 +1,2 @@
+#include <gtk/gtk.h>
+int main() { return 0; }