Skip to content
Snippets Groups Projects
Commit d59dfca7 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #9381: gnome: fixed linking on fedora

New linker rules don't allow for indirect linking. If present, the
javascriptcoregtk lib must be explicitly linked.
parent 0f4362e7
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,8 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0) ...@@ -36,6 +36,8 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0)
PKG_CHECK_MODULES(GCONF, gconf-2.0) PKG_CHECK_MODULES(GCONF, gconf-2.0)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.24)
PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0) PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)
PKG_CHECK_MODULES(JAVASCRIPT_CORE_GTK, javascriptcoregtk-3.0, ,
AC_MSG_RESULT(javascriptcoregtk not installed))
PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
......
...@@ -8,7 +8,8 @@ NOFIFY_LIBS = -lnotify ...@@ -8,7 +8,8 @@ NOFIFY_LIBS = -lnotify
X11_LIBS = -lX11 X11_LIBS = -lX11
LD_LIBS = -ldl LD_LIBS = -ldl
SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la ./dbus/libdbus.la ./widget/libwidget.la ./icons/libicons.la SFLPHONEGTK_LIBS=./contacts/libcontacts.la ./config/libconfig.la \
./dbus/libdbus.la ./widget/libwidget.la ./icons/libicons.la
sflphone_client_gnome_SOURCES = \ sflphone_client_gnome_SOURCES = \
main.c \ main.c \
...@@ -31,15 +32,21 @@ sflphone_client_gnome_SOURCES = \ ...@@ -31,15 +32,21 @@ sflphone_client_gnome_SOURCES = \
str_utils.c str_utils.c
noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \ noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
reqaccount.h sflphone_const.h uimanager.h \ reqaccount.h sflphone_const.h uimanager.h accountlist.h \
accountlist.h sliders.h statusicon.h callable_obj.h conference_obj.h \ sliders.h statusicon.h callable_obj.h conference_obj.h \
shortcuts.h eel-gconf-extensions.h logger.h imwindow.h unused.h str_utils.h shortcuts.h eel-gconf-extensions.h logger.h imwindow.h \
unused.h str_utils.h
sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
$(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) $(LD_LIBS) $(GCONF_LIBS) sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \
$(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \ $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \
$(GLIB_CFLAGS) $(WEBKIT_CFLAGS) $(GCONF_CFLAGS) $(LD_LIBS) $(GCONF_LIBS) \
$(JAVASCRIPT_CORE_GTK_LIBS)
sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \
$(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \
$(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \
$(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS)
# add symbolic link # add symbolic link
install-exec-local: install-exec-local:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment