| Summary: | Support for building on Android | ||
|---|---|---|---|
| Product: | Telepathy | Reporter: | Alvaro Soliverez <alvaro.soliverez> |
| Component: | mission-control | Assignee: | Telepathy bugs list <telepathy-bugs> |
| Status: | RESOLVED FIXED | QA Contact: | Telepathy bugs list <telepathy-bugs> |
| Severity: | normal | ||
| Priority: | medium | Keywords: | patch |
| Version: | git master | ||
| Hardware: | Other | ||
| OS: | other | ||
| Whiteboard: | |||
| i915 platform: | i915 features: | ||
| Attachments: |
Build on systems without gettext
Suppport for Android Build on systems without gettext - fixed Support for Android - fixed Support for Android - fixed Support for Android - fixed |
||
|
Description
Alvaro Soliverez
2011-11-02 05:08:25 UTC
Created attachment 53044 [details] [review] Suppport for Android Comment on attachment 53043 [details] [review] Build on systems without gettext Review of attachment 53043 [details] [review]: ----------------------------------------------------------------- MC isn't really localized, so we should be able to drop the gettext dependency entirely I think? ::: configure.ac @@ +314,5 @@ > +AM_GNU_GETTEXT([external]) > + > +dnl docs/Makefile.am needs to know whether it's an out of tree build > +dnl (srcdir != builddir) > +AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.]) Looks like you're reintroducing this by mistake; it was removed since it's unnecessary. Created attachment 53074 [details] [review] Build on systems without gettext - fixed Comment on attachment 53074 [details] [review] Build on systems without gettext - fixed Review of attachment 53074 [details] [review]: ----------------------------------------------------------------- Looks good. Comment on attachment 53044 [details] [review] Suppport for Android Review of attachment 53044 [details] [review]: ----------------------------------------------------------------- ::: Android.mk @@ +4,5 @@ > + > +TELEPATHY_MISSION_CONTROL_BUILT_SOURCES := \ > + mission-control.pc \ > + src/Android.mk \ > + libmcclient/Android.mk \ libmcclient has been removed; so this patch will need updating. @@ +35,5 @@ > + > +#include all the subdirs... > +-include $(TELEPATHY_MISSION_CONTROL_TOP)/src/Android.mk > +-include $(TELEPATHY_MISSION_CONTROL_TOP)/util/Android.mk > +-include $(TELEPATHY_MISSION_CONTROL_TOP)/libmcclient/Android.mk Ditto ::: server/Makefile.am @@ +49,5 @@ > + -DBUILD_AS_ANDROID_SERVICE \ > + -:LDFLAGS $(mission_control_5_LDADD) -ldbus-1 -ldbus-glib-1 \ > + -lmcclient \ > + -:LIBFILTER_STATIC missioncontrol-server mission-control-plugins \ > + mcclient \ ditto ::: server/mc-server.c @@ +34,5 @@ > static TpDebugSender *debug_sender; > > +#ifdef BUILD_AS_ANDROID_SERVICE > +int telepathy_mission_control_main (int argc, char **argv); > +#endif Doesn't having a non-static prototype in a .c file trigger a warning from the compiler? Created attachment 53418 [details] [review] Support for Android - fixed Fixed the issues found Created attachment 53557 [details] [review] Support for Android - fixed Fixed the libs hardcoding (In reply to comment #7) > Created attachment 53557 [details] [review] [review] > Support for Android - fixed > > Fixed the libs hardcoding This is the patch for Gabble, not MC. Comment on attachment 53074 [details] [review] Build on systems without gettext - fixed Committed. Created attachment 53743 [details] [review] Support for Android - fixed This is the correct patch |
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.