Modify C++ testing code to pass when CXXFLAGS contains -Werror. (Closes #75) (BTW...

[catta] / configure.ac

diff --git a/configure.ac b/configure.ac
index 56ab6aae4e8dec30a25a927a292104d56d6ce209..bb44c52b492bf8f3f41f860ac3a87ea4642ec943 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,9 @@ AC_SUBST(LIBAVAHI_CLIENT_VERSION_INFO, [5:1:2])
 AC_SUBST(LIBAVAHI_GLIB_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_QT3_VERSION_INFO, [1:1:0])
 AC_SUBST(LIBAVAHI_QT4_VERSION_INFO, [1:1:0])
-AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:1:0])
+
+# Do not touch these, since they we took this version-info from upstream HOWL/Bonjour
+AC_SUBST(LIBAVAHI_COMPAT_LIBDNS_SD_VERSION_INFO, [1:0:0])
 AC_SUBST(LIBAVAHI_COMPAT_HOWL_VERSION_INFO, [0:0:0])
 AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
 
@@ -56,6 +58,16 @@ AC_PROG_GCC_TRADITIONAL
 # libtool stuff
 AC_PROG_LIBTOOL
 
+AC_CACHE_CHECK([whether the C++ compiler works], [avahi_cv_sys_cxx_works], [
+    AC_LANG_PUSH([C++])
+    AC_COMPILE_IFELSE([int main() { return 0; }], [avahi_cv_sys_cxx_works=yes],
+        [avahi_cv_sys_cxx_works=no])
+    AC_LANG_POP([C++])
+    ])
+[ if [ "x$avahi_cv_sys_cxx_works" = "xno" ]; then ]
+    AC_MSG_FAILURE([The C++ compiler does not work])
+[ fi ]
+
 ACX_PTHREAD(,AC_MSG_ERROR([Missing POSIX Threads support]))
 
 #