Summary: | examples/wocky-dump-certificates doesn't have TLS_CFLAGS / TLS_LIBS in Makefile | ||
---|---|---|---|
Product: | Wocky | Reporter: | Will Thompson <will> |
Component: | General | Assignee: | Telepathy bugs list <telepathy-bugs> |
Status: | RESOLVED FIXED | QA Contact: | Telepathy bugs list <telepathy-bugs> |
Severity: | normal | ||
Priority: | medium | CC: | rishi.is |
Version: | unspecified | ||
Hardware: | Other | ||
OS: | All | ||
Whiteboard: | |||
i915 platform: | i915 features: | ||
Attachments: |
Patch for wocky
New version of patch |
Description
Will Thompson
2013-03-04 14:41:26 UTC
Created attachment 76588 [details] [review] Patch for wocky Comment on attachment 76588 [details] [review] Patch for wocky Review of attachment 76588 [details] [review]: ----------------------------------------------------------------- I think it'd be better to set wocky_dump_certificates_LDADD to contain both $(LDADD) and $(TLS_LIBS) (or @TLS_LIBS@ if you prefer) - the rest of the examples don't use TLS code directly, so there's no point giving them a strong dependency on it. AM_CFLAGS ought to have $(TLS_CFLAGS) too, so it'll work if gnutls is not on the compiler's default search path. That one doesn't really need to be target-specific in the same way, since it won't alter the code that gets compiled/linked for the other examples - it can just go in AM_CFLAGS. Created attachment 76645 [details] [review] New version of patch absolutely right... TLS_LIBS should of course only be linked to the one needing it (was no issue here as I generally build with -Wl,--as-needed, so it got auto-removed again). This new patch adds TLS only to the dump-register-certificate example and leaves the others alone. Comment on attachment 76645 [details] [review] New version of patch Review of attachment 76645 [details] [review]: ----------------------------------------------------------------- Thanks, I'll merge this. ::: examples/Makefile.am @@ +13,4 @@ > > wocky_dump_certificates_SOURCES = dump-certificates.c > wocky_dump_certificates_DEPENDENCIES = $(top_builddir)/wocky/libwocky.la > +wocky_dump_certificates_CFLAGS = $(TLS_CFLAGS) $(AM_CFLAGS) Not what I suggested, but this is also fine. Fixed in wocky master, and in Gabble master for 0.17.4. Thanks! |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.