Currently gabble/Makefile.am has a hard-coded list of Wocky headers to install if installing headers for building plugins is enabled, which can be updated by a helper script in that directory. This is not ideal. For starters, it's incomplete: it should also include the -enumtypes headers, but my update-y script is not good enough. But actually, we should be able to just do this by running `make install` on Wocky itself. It needs to be conditional, because Gabbles built without --enable-plugin-api shouldn't install Wocky headers. I started doing this but couldn't make it work properly and had other things that needed doing. http://git.collabora.co.uk/?p=user/wjt/wocky.git;a=shortlog;h=refs/heads/install-headers http://git.collabora.co.uk/?p=user/wjt/telepathy-gabble-wjt.git;a=shortlog;h=refs/heads/update-wocky-headers-alternate
I managed to get this working: http://git.collabora.co.uk/?p=user/maiku/wocky.git;a=shortlog;h=refs/heads/install-headers http://git.collabora.co.uk/?p=user/maiku/telepathy-gabble.git;a=shortlog;h=refs/heads/update-wocky-headers-alternate
I like your Wocky branch, but it doesn't merge cleanly. So I reconstructed it, and pushed the reconstruction, with an apology to you. :) http://git.collabora.co.uk/?p=wocky.git;a=commitdiff;h=9148378692967fbcc8b75ce8822a2ab58b3dee66 Now updating the Gabble one...
(In reply to comment #2) > I like your Wocky branch, but it doesn't merge cleanly. So I reconstructed it, > and pushed the reconstruction, with an apology to you. :) aaaand i broke the build.
I managed to get this working again: http://git.collabora.co.uk/?p=user/maiku/wocky.git;a=shortlog;h=refs/heads/install-headers http://git.collabora.co.uk/?p=user/maiku/telepathy-gabble.git;a=shortlog;h=refs/heads/update-wocky-headers-alternate I noticed though one issue is that if you configure wocky with --with-installed-headers, but without setting it to a value, it installs the headers in a yes/ directory. That happens because if no value is set, AC_ARG_WITH sets the variable to "yes". I'm not sure how best to handle that though or how it should ideally act. Suggestions? or is it fine like it is?
(In reply to comment #4) > I managed to get this working again: > > http://git.collabora.co.uk/?p=user/maiku/wocky.git;a=shortlog;h=refs/heads/install-headers > http://git.collabora.co.uk/?p=user/maiku/telepathy-gabble.git;a=shortlog;h=refs/heads/update-wocky-headers-alternate Look good! (I feel bad, though; maybe you should claim --author-dom of these patches. ☺) Oh, one thing, the Gabble branch should delete my beautiful gabble/generate-wockyinclude_HEADERS script. > I noticed though one issue is that if you configure wocky with > --with-installed-headers, but without setting it to a value, it installs the > headers in a yes/ directory. That happens because if no value is set, > AC_ARG_WITH sets the variable to "yes". I'm not sure how best to handle that > though or how it should ideally act. Suggestions? or is it fine like it is? I don't think it's that big a deal. I guess the options are, explicitly check for "yes" (and warn/fail), or use some other macro other than AC_ARG_WITH that doesn't have this behaviour? But given that this flag is pretty much just for Gabble's benefit...
Merged this! Hooray.
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.