* many small fixes for NetBSD

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

diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am
index e183b7e812f6b4588c54255caa98526796689178..c558bd6eb409a079e225debd30ed70dc1fe0f263 100644 (file)
--- a/avahi-compat-howl/Makefile.am
+++ b/avahi-compat-howl/Makefile.am
@@ -91,21 +91,21 @@ address_test_SOURCES = \
        address-test.c \
        warn.c warn.h 
 address_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-address_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+address_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la
 
 text_test_SOURCES = \
        $(HOWLHEADERS) \
        text.c \
        text-test.c \
        warn.c warn.h 
-text_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-text_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+text_test_CFLAGS = $(AM_CFLAGS)  $(PTHREAD_CFLAGS) -I $(srcdir)/include
+text_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la
 
 browse_domain_test_SOURCES = \
        $(HOWLHEADERS) \
        browse-domain-test.c
 browse_domain_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I $(srcdir)/include
-browse_domain_test_LDADD = $(AM_LDADD) libavahi-compat-howl.la
+browse_domain_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) libavahi-compat-howl.la
 
 endif
 endif

diff --git a/avahi-compat-libdns_sd/Makefile.am b/avahi-compat-libdns_sd/Makefile.am
index bd33bb0e6136c83bf6c4c3b87e6511149adc0dd2..25c1f6e52b68da3dd441b547cef4d2edb62d6ef5 100644 (file)
--- a/avahi-compat-libdns_sd/Makefile.am
+++ b/avahi-compat-libdns_sd/Makefile.am
@@ -50,7 +50,7 @@ txt_test_SOURCES = \
        txt-test.c \
        warn.c warn.h
 txt_test_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
-txt_test_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
+txt_test_LDADD = $(AM_LDADD) $(PTHREAD_LIBS) ../avahi-common/libavahi-common.la
 
 # You can test the compatibility layer by sticking in mDNSResponder's
 # dns-sd.c source here, naming it "libdns_sd-test.c" and running "make

diff --git a/avahi-compat-libdns_sd/compat.c b/avahi-compat-libdns_sd/compat.c
index 6a1b30d744c39cae8fb787a3cba3438ceace6714..70ccd4b1ef3141b08508a6ad027851e01956fab4 100644 (file)
--- a/avahi-compat-libdns_sd/compat.c
+++ b/avahi-compat-libdns_sd/compat.c
@@ -33,6 +33,9 @@
 #include <netinet/in.h>
 #include <fcntl.h>
 
+#include <sys/types.h>
+#include <sys/socket.h>
+
 #include <avahi-common/simple-watch.h>
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>

diff --git a/avahi-daemon/setproctitle.c b/avahi-daemon/setproctitle.c
index 819f7b0e7127b7f056bef7d806908ca4a2a076aa..f8d3ddbc94fd11df31cf6f446bdf5f3933dd4716 100644 (file)
--- a/avahi-daemon/setproctitle.c
+++ b/avahi-daemon/setproctitle.c
@@ -78,7 +78,7 @@ void avahi_set_proc_title(const char *fmt,...) {
     char t[256];
 
     va_list ap;
-    va_start(ap);
+    va_start(ap, fmt);
     vsnprintf(t, sizeof(t), fmt, ap);
     va_end(ap);
 

diff --git a/bootstrap.sh b/bootstrap.sh
index ecc8f7c6787db44bab11389a36b9f4004323ee78..71675319fd21d4acb80c13264aff0c183f6be5a9 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,7 +44,7 @@ case `uname -s` in
     export CFLAGS="-I/usr/pkg/include"
     export LDFLAGS="-L/usr/pkg/lib"
     export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
-    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-dbus --disable-glib --disable-gtk --disable-manpages --disable-dbus"
+    FLAGS="$FLAGS --disable-monodoc --disable-mono --disable-qt3 --disable-qt4 --disable-xmltoman --prefix=/opt --with-distro=none --disable-python --disable-glib --disable-gtk --disable-manpages"
     ;;
     Linux)
     ;;