gdm r5696 - in trunk: . gui/simple-greeter gui/user-switch-applet

[bcameron svn gnome org]

Author: bcameron
Date: Tue Feb  5 16:09:00 2008
New Revision: 5696
URL: http://svn.gnome.org/viewvc/gdm?rev=5696&view=rev

Log:
2008-02-05  Brian Cameron  <brian cameron sun com>

        * configure.ac:  Add gio to COMMON_LIBS, needed to link on
          Solaris.
        * gui/simple-greeter/Makefile.am,
          gui/user-switch-applet/Makefile.am:  Reference COMMON_LIBS
          so programs link.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gui/simple-greeter/Makefile.am
   trunk/gui/user-switch-applet/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Feb  5 16:09:00 2008
@@ -54,6 +54,7 @@
 PKG_CHECK_MODULES(COMMON,
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
         gobject-2.0 >= $GLIB_REQUIRED_VERSION
+        gio-2.0 >= $GLIB_REQUIRED_VERSION
 )
 AC_SUBST(COMMON_CFLAGS)
 AC_SUBST(COMMON_LIBS)

Modified: trunk/gui/simple-greeter/Makefile.am
==============================================================================
--- trunk/gui/simple-greeter/Makefile.am	(original)
+++ trunk/gui/simple-greeter/Makefile.am	Tue Feb  5 16:09:00 2008
@@ -82,6 +82,7 @@
 test_greeter_login_window_LDADD =	\
 	$(top_builddir)/common/libgdmcommon.la	\
 	libgdmuser.la			\
+	$(COMMON_LIBS)			\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(POLKIT_GNOME_LIBS)		\
 	$(RBAC_LIBS)			\
@@ -167,6 +168,7 @@
 
 test_user_chooser_LDADD =	\
 	libgdmuser.la		\
+	$(COMMON_LIBS)		\
 	$(SIMPLE_GREETER_LIBS)	\
 	$(POLKIT_GNOME_LIBS)	\
 	$(NULL)
@@ -177,6 +179,7 @@
 
 test_user_manager_LDADD =	\
 	libgdmuser.la		\
+	$(COMMON_LIBS)		\
 	$(SIMPLE_GREETER_LIBS)	\
 	$(POLKIT_GNOME_LIBS)	\
 	$(NULL)
@@ -225,6 +228,7 @@
 	$(top_builddir)/common/libgdmcommon.la	\
 	libgdmuser.la			\
 	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
+	$(COMMON_LIBS)			\
 	$(EXTRA_GREETER_LIBS)   	\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(POLKIT_GNOME_LIBS)		\

Modified: trunk/gui/user-switch-applet/Makefile.am
==============================================================================
--- trunk/gui/user-switch-applet/Makefile.am	(original)
+++ trunk/gui/user-switch-applet/Makefile.am	Tue Feb  5 16:09:00 2008
@@ -27,6 +27,7 @@
 
 gdm_user_switch_applet_LDADD = 		\
 	$(top_builddir)/gui/simple-greeter/libgdmuser.la	\
+	$(COMMON_LIBS)					\
 	$(APPLET_LIBS)					\
 	$(NULL)