diff options
-rw-r--r-- | avahi-compat-howl/Makefile.am | 8 | ||||
-rw-r--r-- | avahi-compat-libdns_sd/Makefile.am | 2 | ||||
-rw-r--r-- | avahi-compat-libdns_sd/compat.c | 3 | ||||
-rw-r--r-- | avahi-daemon/setproctitle.c | 2 | ||||
-rwxr-xr-x | bootstrap.sh | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/avahi-compat-howl/Makefile.am b/avahi-compat-howl/Makefile.am index e183b7e..c558bd6 100644 --- 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 bd33bb0..25c1f6e 100644 --- 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 6a1b30d..70ccd4b 100644 --- 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 819f7b0..f8d3ddb 100644 --- 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 ecc8f7c..7167531 100755 --- 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) ;; |