From: Marcus Folkesson Date: Tue, 3 Jul 2018 08:02:46 +0000 (+0200) Subject: build: add ostree-soup-* to build process when configured with avahi X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~21^2~20 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8af389b758970ce73929c84315505ac8410f355b;p=ostree.git build: add ostree-soup-* to build process when configured with avahi 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 Closes: #1666 Approved by: cgwalters --- diff --git a/Makefile-libostree.am b/Makefile-libostree.am index 01a209d1..dbc9ebb8 100644 --- a/Makefile-libostree.am +++ b/Makefile-libostree.am @@ -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