[phonemgr] Fix build with strict linker
- From: Daniele Forsi <dforsi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [phonemgr] Fix build with strict linker
- Date: Sun, 16 Oct 2011 20:35:11 +0000 (UTC)
commit e42651b5cf634c38876391e9a10451e9710d13b1
Author: Marcus HÃwe <suse-tux gmx de>
Date: Sun Oct 16 19:16:16 2011 +0200
Fix build with strict linker
Closes #659449
configure.in | 2 +-
src/Makefile.am | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.in b/configure.in
index 46b537a..0029734 100644
--- a/configure.in
+++ b/configure.in
@@ -76,7 +76,7 @@ AC_ARG_ENABLE(telepathy,
[ENABLE_TELEPATHY=yes]) dnl Default value
if test x$ENABLE_TELEPATHY = "xyes" ; then
- PKG_CHECK_MODULES(TELEPATHY, telepathy-glib,
+ PKG_CHECK_MODULES(TELEPATHY, telepathy-glib dbus-glib-1,
[HAVE_TELEPATHY=yes], [HAVE_TELEPATHY=no])
fi
if test x$HAVE_TELEPATHY = "xyes"; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 5288aa5..b83e2d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,9 +31,9 @@ gnome_phone_manager_SOURCES = \
phonemgr-object.h
gnome_phone_manager_LDADD = \
+ ../cut-n-paste/e-contact-entry/libecontact-entry.la \
$(PHONEMGR_LIBS) \
../libgsm/libgsmwrap.la \
- ../cut-n-paste/e-contact-entry/libecontact-entry.la \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
BUILT_SOURCES = phone-manager-interface.h
@@ -49,8 +49,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
# The test program
noinst_PROGRAMS = test-entry
test_entry_SOURCES = test-entry.c e-phone-entry.c e-phone-entry.h
-test_entry_LDADD = $(PHONEMGR_LIBS) \
+test_entry_LDADD = \
../cut-n-paste/e-contact-entry/libecontact-entry.la \
+ $(PHONEMGR_LIBS) \
../cut-n-paste/gconf-bridge/libgconf-bridge.la
BUILT_SOURCES += $(MARSHALFILES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]