gnome-settings-daemon r191 - in trunk: . plugins/mouse

[jensg svn gnome org]

Author: jensg
Date: Fri Feb 29 22:49:18 2008
New Revision: 191
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=191&view=rev

Log:
2008-02-29  Jens Granseuer  <jensgr gmx net>

	* configure.ac:
	* plugins/mouse/Makefile.am: when building with XInput support,
	actually link against libXi, or we'll fail to load the plugin due
	to unresolved symbols (bug #519488)


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/mouse/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 29 22:49:18 2008
@@ -146,9 +146,11 @@
 
 AC_PATH_XTRA
 
-dnl
-dnl Check for XInput
-dnl
+ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
+
+dnl ---------------------------------------------------------------------------
+dnl - XInput
+dnl ---------------------------------------------------------------------------
 
 have_xinput=no
 AC_CHECK_LIB(Xi, XListInputDevices,
@@ -159,9 +161,7 @@
 	  :, [#include <X11/Xlib.h>])], : ,
        -lXi $x_libs)
 AM_CONDITIONAL(HAVE_XINPUT, [test $have_xinput = yes])
-
-
-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $XINPUT_LIBS"
+AC_SUBST(XINPUT_LIBS)
 
 dnl ---------------------------------------------------------------------------
 dnl - XRandR

Modified: trunk/plugins/mouse/Makefile.am
==============================================================================
--- trunk/plugins/mouse/Makefile.am	(original)
+++ trunk/plugins/mouse/Makefile.am	Fri Feb 29 22:49:18 2008
@@ -1,8 +1,4 @@
-NULL =
-
-plugin_LTLIBRARIES = \
-	libmouse.la		\
-	$(NULL)
+plugin_LTLIBRARIES = libmouse.la
 
 libmouse_la_SOURCES = 		\
 	gsd-mouse-plugin.h	\
@@ -12,8 +8,7 @@
 	gsd-locate-pointer.h	\
 	gsd-locate-pointer.c	\
 	gsd-timeline.h		\
-	gsd-timeline.c		\
-	$(NULL)
+	gsd-timeline.c
 
 libmouse_la_CPPFLAGS = \
 	-I$(top_srcdir)/gnome-settings-daemon		\
@@ -25,29 +20,18 @@
 	$(AM_CFLAGS)
 
 libmouse_la_LDFLAGS = 		\
-	$(GSD_PLUGIN_LDFLAGS)	\
-	$(NULL)
+	$(GSD_PLUGIN_LDFLAGS)
 
 libmouse_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
-	$(NULL)
+	$(XINPUT_LIBS)
 
-plugin_in_files = 		\
-	mouse.gnome-settings-plugin.in	\
-	$(NULL)
+plugin_in_files = mouse.gnome-settings-plugin.in
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
-EXTRA_DIST = 			\
-	$(plugin_in_files)	\
-	$(NULL)
-
-CLEANFILES = 			\
-	$(plugin_DATA)		\
-	$(NULL)
-
-DISTCLEANFILES =		\
-	$(plugin_DATA)		\
-	$(NULL)
+EXTRA_DIST = $(plugin_in_files)
+CLEANFILES = $(plugin_DATA)
+DISTCLEANFILES = $(plugin_DATA)
 
 @GSD_INTLTOOL_PLUGIN_RULE@