From d7ca19e0f331d70930562149d6e2bd835e72b83c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 12 Oct 2005 14:38:07 +0000 Subject: 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 --- tests/Makefile.am | 3 ++- tests/c-plus-plus-test-gen.py | 5 +++++ tests/c-plus-plus-test.cc | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1fee9d8..b3fa8ca 100644 --- 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 6b18db6..46d6762 100755 --- 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 +#endif + """ for f in sys.argv[1:]: diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc index 2535d38..b1b324c 100644 --- a/tests/c-plus-plus-test.cc +++ b/tests/c-plus-plus-test.cc @@ -19,6 +19,11 @@ USA. ***/ +#ifdef HAVE_CONFIG_H +#include +#endif + + #include #include #include @@ -30,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -41,11 +47,16 @@ #include #include #include +#include #include #include +#include +#include #include #include #include +#include +#include #include #include #include @@ -54,6 +65,7 @@ #include #include #include +#include #include #include #include -- cgit