* add C++ test

* add more autoconf checks

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

diff --git a/Makefile.am b/Makefile.am
index 05b84bc9c9b231008d2e88701e3f15593346f53d..e23db8e97d97f899ae1ef66f65b161094fb18c4a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@ SUBDIRS = \
        avahi-dnsconfd \
        avahi-utils \
        examples \
-       man
+       man \
+       tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = avahi-core.pc

diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c
index a76aa71e018e37692f7be0d80adf49d90bf1b71b..7fed84969a10f79151204687a9cdc4104d2c933c 100644 (file)
--- a/avahi-dnsconfd/main.c
+++ b/avahi-dnsconfd/main.c
@@ -625,7 +625,6 @@ gint main(gint argc, gchar *argv[]) {
         r = (daemon_pid_file_is_running() >= 0) ? 0 : 1;
 
 
-    
 finish:
 
     if (daemonize)

diff --git a/configure.ac b/configure.ac
index 6278af64c0e1a5b50a34720a253e33d27c02e6c2..7aa4fa4255de9159a6eea5e8bbb5bf1f35ea1a18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ fi
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_GNU_SOURCE
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -58,7 +59,9 @@ AC_HEADER_SYS_WAIT
 # Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_SELECT_ARGTYPES
-AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid])
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([gethostname memchr memmove memset mkdir select socket strchr strcspn strdup strerror strrchr strspn strstr uname setresuid setreuid strcasecmp gettimeofday])
 
 AC_FUNC_CHOWN
 AC_FUNC_STAT
@@ -294,6 +297,7 @@ avahi-utils/avahi/Makefile
 examples/Makefile
 common/Makefile
 man/Makefile
+tests/Makefile
 ])
 AC_OUTPUT
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644 (file)
index 0000000..f300c6c
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,39 @@
+# $Id$
+#
+# This file is part of avahi.
+# 
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+AM_CFLAGS= \
+       -I$(top_srcdir)
+
+# GLIB 2.0
+AM_CFLAGS+=$(GLIB20_CFLAGS)
+AM_LDADD=$(GLIB20_LIBS)
+
+noinst_PROGRAMS = \
+       c-plus-plus-test
+
+c_plus_plus_test_SOURCES = \
+       c-plus-plus-test.cc
+
+c_plus_plus_CFLAGS = $(AM_CFLAGS)
+c_plus_plus_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-core/libavahi-core.la
+
+EXTRA_DIST=c-plus-plus-test-gen.py
+
+gen:
+       python ./c-plus-plus-test-gen.py > c-plus-plus-test.cc

diff --git a/tests/c-plus-plus-test-gen.py b/tests/c-plus-plus-test-gen.py
new file mode 100755 (executable)
index 0000000..62498f5
--- /dev/null
+++ b/tests/c-plus-plus-test-gen.py
@@ -0,0 +1,62 @@
+#!/usr/bin/python
+
+# $Id$
+#
+# This file is part of avahi.
+# 
+# avahi is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version.
+#
+# avahi is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with avahi; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+
+import os
+
+def print_includes(dir):
+
+    files = os.listdir("../%s" % dir)
+    files = filter(lambda fn: fn.endswith(".h") and not fn.startswith("."), files)
+
+    for f in files:
+        print "#include <%s/%s>" % (dir, f)
+
+
+print """/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+"""
+
+print_includes("avahi-common")
+print_includes("avahi-core")
+
+print """
+int main(int argc, char*argv[]) {
+    return 0;
+}
+"""

diff --git a/tests/c-plus-plus-test.cc b/tests/c-plus-plus-test.cc
new file mode 100644 (file)
index 0000000..483ff5b
--- /dev/null
+++ b/tests/c-plus-plus-test.cc
@@ -0,0 +1,60 @@
+/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#include <avahi-common/alternative.h>
+#include <avahi-common/defs.h>
+#include <avahi-common/timeval.h>
+#include <avahi-common/watch.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/address.h>
+#include <avahi-common/simple-watch.h>
+#include <avahi-common/llist.h>
+#include <avahi-common/error.h>
+#include <avahi-common/domain.h>
+#include <avahi-common/gccmacro.h>
+#include <avahi-common/dbus.h>
+#include <avahi-common/cdecl.h>
+#include <avahi-common/strlst.h>
+#include <avahi-core/prioq.h>
+#include <avahi-core/cache.h>
+#include <avahi-core/rr.h>
+#include <avahi-core/hashmap.h>
+#include <avahi-core/util.h>
+#include <avahi-core/socket.h>
+#include <avahi-core/response-sched.h>
+#include <avahi-core/browse.h>
+#include <avahi-core/rrlist.h>
+#include <avahi-core/query-sched.h>
+#include <avahi-core/core.h>
+#include <avahi-core/probe-sched.h>
+#include <avahi-core/server.h>
+#include <avahi-core/dns.h>
+#include <avahi-core/timeeventq.h>
+#include <avahi-core/iface.h>
+#include <avahi-core/announce.h>
+#include <avahi-core/netlink.h>
+#include <avahi-core/log.h>
+#include <avahi-core/fdutil.h>
+
+int main(int argc, char*argv[]) {
+    return 0;
+}
+