diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-07-07 11:36:13 +0000 |
|---|---|---|
| committer | Alberto Mardegan <mardy@users.sourceforge.net> | 2008-07-07 11:36:13 +0000 |
| commit | 6913705b25083865882a6a1122bf804f889552d8 (patch) | |
| tree | 3f57f8f14f023825b3cbdf481df931696f5a3422 | |
| parent | 2dbf9db50a64b5dfb645049660542f372482e5ba (diff) | |
libmissioncontrol is the only module depending on libtelepathy.
git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@490 d91c8aed-3f2b-0410-a83d-924a1c20a0ba
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libmissioncontrol/Makefile.am | 4 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-07-07 Alberto Mardegan <alberto.mardegan@nokia.com> + + * configure.ac, libmissioncontrol/Makefile.am: + libmissioncontrol is the only module depending on libtelepathy. + === telepathy-mission-control 5.0.beta20 === 2008-07-07 Alberto Mardegan <alberto.mardegan@nokia.com> diff --git a/configure.ac b/configure.ac index 9b20ee97..2fd4daba 100644 --- a/configure.ac +++ b/configure.ac @@ -148,10 +148,14 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.51, dbus-glib-1 >= 0.51], have_dbus=yes, ha AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) -PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.6 libtelepathy >= 0.3.0) +PKG_CHECK_MODULES(TELEPATHY, telepathy-glib >= 0.7.6) AC_SUBST(TELEPATHY_LIBS) AC_SUBST(TELEPATHY_CFLAGS) +PKG_CHECK_MODULES(LIBTELEPATHY, libtelepathy >= 0.3.0) +AC_SUBST(LIBTELEPATHY_LIBS) +AC_SUBST(LIBTELEPATHY_CFLAGS) + GCONF_REQUIRED_VERSION=2.0.0 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION) AC_SUBST(GCONF_CFLAGS) diff --git a/libmissioncontrol/Makefile.am b/libmissioncontrol/Makefile.am index 9554d27b..859f6205 100644 --- a/libmissioncontrol/Makefile.am +++ b/libmissioncontrol/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ $(DBUS_CFLAGS) \ $(TELEPATHY_CFLAGS) \ + $(LIBTELEPATHY_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ -DMC_DISABLE_DEPRECATED \ @@ -87,7 +88,8 @@ nodist_libmissioncontrol_client_la_SOURCES = \ _gen/signals-marshal.list \ _gen/svc-nmc4.c -libmissioncontrol_client_la_LIBADD = $(GCONF_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(TELEPATHY_LIBS) +libmissioncontrol_client_la_LIBADD = $(GCONF_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) \ + $(TELEPATHY_LIBS) $(LIBTELEPATHY_LIBS) libmissioncontrol_client_la_LDFLAGS = $(common_ldflags) \ -export-symbols-regex "^(mc_)|(omc_)|(mission_control_)" \ |