From 576d4b976daad79f6eba0f73f66d783df58dd970 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 23 Mar 2009 18:02:16 -0400
Subject: [PATCH] FIx hard-coded address book build system
---
sflphone-gtk/configure.ac | 3 +--
sflphone-gtk/src/contactlist/Makefile.am | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index 0686cbd409..e6e2541293 100644
--- a/sflphone-gtk/configure.ac
+++ b/sflphone-gtk/configure.ac
@@ -33,11 +33,10 @@ PKG_CHECK_MODULES(DEPS, \
libnotify >= 0.4 \
gtk+-2.0 >= 2.2 \
glib-2.0 >= 2.2 \
- libsexy >= 0.1 \
+ libsexy >= 0.1 \
libebook-1.2 >= 2.22
)
-
AC_SUBST(DEPS_CFLAGS)
AC_SUBST(DEPS_LIBS)
diff --git a/sflphone-gtk/src/contactlist/Makefile.am b/sflphone-gtk/src/contactlist/Makefile.am
index d8fee4636b..d603d369c8 100644
--- a/sflphone-gtk/src/contactlist/Makefile.am
+++ b/sflphone-gtk/src/contactlist/Makefile.am
@@ -3,6 +3,6 @@ noinst_LTLIBRARIES = libcontact.la
libcontact_la_SOURCES = \
eds.c
-libcontact_la_LDFLAGS= -pthread -lebook-1.2 -lgnome-2 -lpopt -ledataserver-1.2 -lxml2 -lgconf-2 -lsoup-2.4 -lbonobo-2 -lbonobo-activation -lORBit-2 -lgthread-2.0 -lrt -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lgio-2.0 -lcairo -lpango-1.0 -lfreetype -lz -lfontconfig -lgmodule-2.0 -lgobject-2.0 -lglib-2.0
-
-libcontact_la_CFLAGS=-DORBIT2=1 -pthread -I/usr/include/evolution-data-server-2.24 -I/usr/include/libbonobo-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/gconf/2 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/libxml2 -I/usr/include/libsoup-2.4 -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pygtk-2.0
+libcontact_la_LDFLAGS=@DEPS_LDFLAGS@
+
+libcontact_la_CFLAGS=@DEPS_CFLAGS@
--
GitLab