From 80d4fed16263cb7bf31ca219642b867e4e77f45a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Jul 2010 06:49:20 -0400 Subject: Bug 624500 - Missing EggSMClient linker flags in shell --- configure.ac | 6 +++++- shell/Makefile.am | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c793762b20..5a8542084a 100644 --- a/configure.ac +++ b/configure.ac @@ -1376,7 +1376,11 @@ AC_SUBST(DATASERVER_EXEC_VERSION) dnl ***************** dnl EggSMClient Flags dnl ***************** -EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, $GTK) +if test "x$os_win32" = "xyes"; then + EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, $GTK) +else + EVO_SET_COMPILE_FLAGS(EGG_SMCLIENT, $GTK,, -lSM -lICE) +fi AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) diff --git a/shell/Makefile.am b/shell/Makefile.am index 7fd03afaa3..fe0abd89b3 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -59,6 +59,7 @@ libeshell_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-shell\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(EGG_SMCLIENT_CFLAGS) \ $(CLUTTER_CFLAGS) \ $(TZDIALOG_CFLAGS) \ $(SHELL_CFLAGS) @@ -96,6 +97,7 @@ libeshell_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(EGG_SMCLIENT_LIBS) \ $(CLUTTER_LIBS) \ $(SHELL_LIBS) -- cgit v1.2.3