gnome-session r5177 - in trunk: . egg gnome-session tools

[lucasr svn gnome org]

Author: lucasr
Date: Thu Jan  8 01:13:25 2009
New Revision: 5177
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5177&view=rev

Log:
2009-01-08  Lucas Rocha  <lucasr gnome org>

	Bug 566858 â configure script does not check for sm package (needed to
	check X11/SM/SMlib.h)

	* configure.am, gnome-session/Makefile.am, egg/Makefile.am,
	tools/Makefile.am: check for sm and ice libs through pkgconfig and use
	it in the build.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/egg/Makefile.am
   trunk/gnome-session/Makefile.am
   trunk/tools/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jan  8 01:13:25 2009
@@ -80,6 +80,9 @@
         gtk+-2.0 >= $GTK_REQUIRED
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 
+PKG_CHECK_MODULES(SM, sm)
+PKG_CHECK_MODULES(ICE, ice)
+
 PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 

Modified: trunk/egg/Makefile.am
==============================================================================
--- trunk/egg/Makefile.am	(original)
+++ trunk/egg/Makefile.am	Thu Jan  8 01:13:25 2009
@@ -2,13 +2,18 @@
 platform_ltlibraries =                   \
 	libeggdesktopfile.la             \
 	libeggsmclient-gnome.la
-platform_libs = libeggdesktopfile.la -lSM -lICE
+platform_libs = 			\
+	libeggdesktopfile.la		\
+	$(SM_LIBS)			\
+	$(ICE_LIBS)
 platform_sources = eggsmclient-xsmp.c
 
 INCLUDES =                               \
 	-DG_LOG_DOMAIN=\""EggSMClient"\" \
 	$(platform_defines)              \
 	$(EGG_SMCLIENT_CFLAGS)           \
+	$(SM_LIBS)			 \
+	$(ICE_LIBS)			 \
 	$(WARN_CFLAGS)			 \
 	$(DISABLE_DEPRECATED_CFLAGS)
 

Modified: trunk/gnome-session/Makefile.am
==============================================================================
--- trunk/gnome-session/Makefile.am	(original)
+++ trunk/gnome-session/Makefile.am	Thu Jan  8 01:13:25 2009
@@ -12,6 +12,8 @@
 INCLUDES =					\
 	$(WARN_CFLAGS)				\
 	$(DISABLE_DEPRECATED_CFLAGS)		\
+	$(SM_CFLAGS)				\
+	$(ICE_CFLAGS)				\
 	$(GNOME_SESSION_CFLAGS)			\
 	$(GCONF_CFLAGS)				\
 	$(POLKIT_GNOME_CFLAGS)			\
@@ -41,9 +43,10 @@
 	$(NULL)
 
 gnome_session_LDADD =				\
-	-lSM -lICE				\
 	libgsmutil.la 				\
 	$(top_builddir)/egg/libeggdesktopfile.la \
+	$(SM_LIBS)				\
+	$(ICE_LIBS)				\
 	$(GNOME_SESSION_LIBS)			\
 	$(GCONF_LIBS)				\
 	$(POLKIT_GNOME_LIBS)			\

Modified: trunk/tools/Makefile.am
==============================================================================
--- trunk/tools/Makefile.am	(original)
+++ trunk/tools/Makefile.am	Thu Jan  8 01:13:25 2009
@@ -9,7 +9,8 @@
 	-DLOCALE_DIR=\""$(datadir)/locale"\"
 
 gnome_session_save_LDADD =			\
-	-lSM -lICE				\
+	$(SM_LIBS)				\
+	$(ICE_LIBS)				\
 	$(GNOME_SESSION_LIBS)			\
 	$(DBUS_GLIB_LIBS)			\
 	$(GCONF_LIBS)