update C++ tests, and compile them only when HAVE_NETLINK is set

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@737 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1fee9d8985131152ef3abae774416b26b098b55b..b3fa8cac19ef1dd28e5e6abb5c1ab12915c89a2e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,6 +22,7 @@ AM_CFLAGS= \
 
 if HAVE_GLIB
 if HAVE_DBUS
+if HAVE_NETLINK
 
 noinst_PROGRAMS = c-plus-plus-test
 
@@ -41,7 +42,7 @@ c_plus_plus_test_LDADD = \
        $(GLIB20_LIBS) \
        $(DBUS_LIBS)
 
-
+endif
 endif
 endif
 

diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py
index 6b18db612410aec4820463307498a70f714f26c7..46d67627cebedd6b0091c544eb34decb413ea676 100755 (executable)
--- a/tests/c-plus-plus-test-gen.py
+++ b/tests/c-plus-plus-test-gen.py
@@ -51,6 +51,11 @@ print """/* $Id$ */
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 """
 
 for f in sys.argv[1:]:

diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc
index 2535d38db6bd3fa16cef9a900923bf00be1fdce7..b1b324cff86432ab5ed1bb50ba2d97d769372d31 100644 (file)
--- a/tests/c-plus-plus-test.cc
+++ b/tests/c-plus-plus-test.cc
@@ -19,6 +19,11 @@
   USA.
 ***/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
 #include <avahi-common/address.h>
 #include <avahi-common/alternative.h>
 #include <avahi-common/cdecl.h>
@@ -30,6 +35,7 @@
 #include <avahi-common/gccmacro.h>
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
+#include <avahi-common/rlist.h>
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/strlst.h>
 #include <avahi-common/timeval.h>
@@ -41,11 +47,16 @@
 #include <avahi-core/dns.h>
 #include <avahi-core/fdutil.h>
 #include <avahi-core/hashmap.h>
+#include <avahi-core/iface-linux.h>
 #include <avahi-core/iface.h>
 #include <avahi-core/log.h>
+#include <avahi-core/lookup.h>
+#include <avahi-core/multicast-lookup.h>
 #include <avahi-core/netlink.h>
 #include <avahi-core/prioq.h>
 #include <avahi-core/probe-sched.h>
+#include <avahi-core/publish.h>
+#include <avahi-core/querier.h>
 #include <avahi-core/query-sched.h>
 #include <avahi-core/response-sched.h>
 #include <avahi-core/rr.h>
@@ -54,6 +65,7 @@
 #include <avahi-core/socket.h>
 #include <avahi-core/timeeventq.h>
 #include <avahi-core/util.h>
+#include <avahi-core/wide-area.h>
 #include <avahi-client/client.h>
 #include <avahi-client/internal.h>
 #include <avahi-glib/glib-malloc.h>