build: add ostree-soup-* to build process when configured with avahi
authorMarcus Folkesson <marcus.folkesson@gmail.com>
Tue, 3 Jul 2018 08:02:46 +0000 (10:02 +0200)
committerAtomic Bot <atomic-devel@projectatomic.io>
Tue, 3 Jul 2018 19:42:49 +0000 (19:42 +0000)
Avoid getting these link errors:
    ./.libs/libostree-1.so: undefined reference to `soup_uri_set_path'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_new'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_free'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_set_scheme'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_to_string'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_set_host'
    ./.libs/libostree-1.so: undefined reference to `soup_uri_set_port'
    collect2: error: ld returned 1 exit status

Reproduce with:
    ./configure --with-avahi --without-soup

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Closes: #1666
Approved by: cgwalters

Makefile-libostree.am

index 01a209d15bfaf86da8aa3c6fca9e911782cc2f55..dbc9ebb87934b0f4d24cae9a674d9d7deb6f5a64 100644 (file)
@@ -238,6 +238,13 @@ if USE_LIBSOUP
 libostree_1_la_SOURCES += src/libostree/ostree-fetcher-soup.c
 libostree_1_la_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
 libostree_1_la_LIBADD += $(OT_INTERNAL_SOUP_LIBS)
+else
+if USE_AVAHI
+libostree_1_la_SOURCES += src/libostree/ostree-soup-uri.h \
+       src/libostree/ostree-soup-uri.c \
+       src/libostree/ostree-soup-form.c \
+       $(NULL)
+endif
 endif
 endif