From 52e36b85b4c6cc13e3efc7fe26aa0e57c0861f89 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Tue, 20 Mar 2012 18:13:04 -0400 Subject: [PATCH] * #9381: gnome: fixed make check for fedora 16 --- gnome/configure.ac | 1 + gnome/src/Makefile.am | 1 - gnome/tests/Makefile.am | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gnome/configure.ac b/gnome/configure.ac index bd9d6df412..542e7996f0 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -36,6 +36,7 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0) PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24) PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0) +PKG_CHECK_MODULES(X11, x11) PKG_CHECK_MODULES(JAVASCRIPT_CORE_GTK, javascriptcoregtk-3.0, , AC_MSG_RESULT(javascriptcoregtk not installed)) diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am index d27a1680da..eb80e71377 100644 --- a/gnome/src/Makefile.am +++ b/gnome/src/Makefile.am @@ -5,7 +5,6 @@ bin_PROGRAMS = sflphone-client-gnome SUBDIRS = config contacts dbus widget icons NOFIFY_LIBS = -lnotify -X11_LIBS = -lX11 LD_LIBS = -ldl SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la \ diff --git a/gnome/tests/Makefile.am b/gnome/tests/Makefile.am index 861a254ea7..4cd128b801 100644 --- a/gnome/tests/Makefile.am +++ b/gnome/tests/Makefile.am @@ -47,6 +47,9 @@ check_dbus_SOURCES = check_dbus.c $(top_srcdir)/src/logger.c \ check_dbus_CFLAGS = @CHECK_CFLAGS@ @GTK_CFLAGS@ @DBUSGLIB_CFLAGS@ @GCONF_CFLAGS@ @WEBKIT_CFLAGS@ -check_dbus_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GCONF_LIBS@ $(top_builddir)/src/widget/libwidget.la $(top_builddir)/src/icons/libicons.la +check_dbus_LDADD = $(SFLPHONE_LIBS) @CHECK_LIBS@ @GCONF_LIBS@ \ + $(top_builddir)/src/widget/libwidget.la \ + $(top_builddir)/src/icons/libicons.la @X11_LIBS@ \ + @JAVASCRIPT_CORE_GTK_LIBS@ -ldl ########################################################### -- GitLab