* fix pkgconfig file

* fix recursive resolving
* install header files

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

diff --git a/avahi-core.pc.in b/avahi-core.pc.in
index e91c0689e6209648d0950a66a049348e0a97c854..442c867d93322c0eb277b9a6e969932f4ae3f6ae 100644 (file)
--- a/avahi-core.pc.in
+++ b/avahi-core.pc.in
@@ -6,5 +6,5 @@ includedir=${prefix}/include
 Name: avahi-core
 Description: Avahi Embeddable Multicast DNS Engine
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lavahic-core
+Libs: -L${libdir} -lavahi-core
 Cflags: -D_REENTRANT -I${includedir}

diff --git a/avahi-core/Makefile.am b/avahi-core/Makefile.am
index 0e73c7f4e45cfde5289da26d3275295659d90ea5..6fe184ae0dac621358254851de1767add40ad25a 100644 (file)
--- a/avahi-core/Makefile.am
+++ b/avahi-core/Makefile.am
@@ -26,6 +26,15 @@ AM_LDADD=$(GLIB20_LIBS)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
+avahiincludedir=$(includedir)/avahi-core
+
+avahiinclude_HEADERS = \
+       rr.h \
+       address.h \
+       strlst.h \
+       core.h \
+       alternative.h
+
 lib_LTLIBRARIES = \
        libavahi-core.la 
 

diff --git a/avahi-core/avahi-test.c b/avahi-core/avahi-test.c
index 805453a987cab36b6bda2f9aa087d95b66d843a4..1c3dc579d0b70dbe9edbe1b2a7facd4a0655e84c 100644 (file)
--- a/avahi-core/avahi-test.c
+++ b/avahi-core/avahi-test.c
@@ -206,7 +206,7 @@ int main(int argc, char *argv[]) {
     loop = g_main_loop_new(NULL, FALSE);
     
 /*      g_timeout_add(1000*5, dump_timeout, server);   */
-/*     g_timeout_add(1000*30, quit_timeout, loop);     */
+    g_timeout_add(1000*30, quit_timeout, loop);     
     
     g_main_loop_run(loop);
     g_main_loop_unref(loop);

diff --git a/avahi-core/resolve-address.c b/avahi-core/resolve-address.c
index f6fa6358563f261624d5a8b43f65a119c3fe2079..53e4468eea47f68e07e438baa915a382a86194d6 100644 (file)
--- a/avahi-core/resolve-address.c
+++ b/avahi-core/resolve-address.c
@@ -94,6 +94,11 @@ AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, gint inter
     r->callback = callback;
     r->userdata = userdata;
 
+    avahi_elapse_time(&tv, 1000, 0);
+    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
+
+    AVAHI_LLIST_PREPEND(AvahiAddressResolver, resolver, server->address_resolvers, r);
+    
     if (address->family == AF_INET)
         n = avahi_reverse_lookup_name_ipv4(&address->data.ipv4);
     else 
@@ -105,10 +110,6 @@ AvahiAddressResolver *avahi_address_resolver_new(AvahiServer *server, gint inter
     r->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
 
-    avahi_elapse_time(&tv, 1000, 0);
-    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
-
-    AVAHI_LLIST_PREPEND(AvahiAddressResolver, resolver, server->address_resolvers, r);
     
     return r;
 }

diff --git a/avahi-core/resolve-host-name.c b/avahi-core/resolve-host-name.c
index 751ba72cc472c77daf2f9c3de0428eb4a73e246f..f29b575f51b8b057c40a6d35a46268e964c5a735 100644 (file)
--- a/avahi-core/resolve-host-name.c
+++ b/avahi-core/resolve-host-name.c
@@ -119,24 +119,25 @@ AvahiHostNameResolver *avahi_host_name_resolver_new(AvahiServer *server, gint in
     r->callback = callback;
     r->userdata = userdata;
 
+    r->record_browser_a = r->record_browser_aaaa = NULL;
+        
+    avahi_elapse_time(&tv, 1000, 0);
+    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
+
+    AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+
+    
     if (aprotocol == AF_INET || aprotocol == AF_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_A);
         r->record_browser_a = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
-    } else
-        r->record_browser_a = NULL;
+    } 
 
     if (aprotocol == AF_INET6 || aprotocol == AF_UNSPEC) {
         k = avahi_key_new(host_name, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_AAAA);
         r->record_browser_aaaa = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
         avahi_key_unref(k);
-    } else
-        r->record_browser_aaaa = NULL;
-
-    avahi_elapse_time(&tv, 1000, 0);
-    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
-    
-    AVAHI_LLIST_PREPEND(AvahiHostNameResolver, resolver, server->host_name_resolvers, r);
+    }
     
     return r;
 }

diff --git a/avahi-core/resolve-service.c b/avahi-core/resolve-service.c
index 5c0c988e8457833a8bbcf3fabea72b9947297be0..e854cca8f5fdc6fc0bb797bbf08c071ed5380fff 100644 (file)
--- a/avahi-core/resolve-service.c
+++ b/avahi-core/resolve-service.c
@@ -221,7 +221,12 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     avahi_escape_label((guint8*) name, strlen(name), &n, &l);
     snprintf(n, l, ".%s%s", r->service_type, r->domain_name);
 
-    g_message("<%s>", t);
+    avahi_elapse_time(&tv, 1000, 0);
+    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
+    
+    AVAHI_LLIST_PREPEND(AvahiServiceResolver, resolver, server->service_resolvers, r);
+
+    r->record_browser_a = r->record_browser_aaaa = r->record_browser_srv = r->record_browser_txt = NULL;
     
     k = avahi_key_new(t, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
     r->record_browser_srv = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
@@ -231,13 +236,6 @@ AvahiServiceResolver *avahi_service_resolver_new(AvahiServer *server, gint inter
     r->record_browser_txt = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, r);
     avahi_key_unref(k);
     
-    r->record_browser_a = r->record_browser_aaaa = NULL;
-    
-    avahi_elapse_time(&tv, 1000, 0);
-    r->time_event = avahi_time_event_queue_add(server->time_event_queue, &tv, time_event_callback, r);
-    
-    AVAHI_LLIST_PREPEND(AvahiServiceResolver, resolver, server->service_resolvers, r);
-    
     return r;
 }