gnome-settings-daemon r263 - in trunk: . plugins/media-keys/actions

[jensg svn gnome org]

Author: jensg
Date: Sat Apr  5 10:44:01 2008
New Revision: 263
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=263&view=rev

Log:
2008-04-05  Jens Granseuer  <jensgr gmx net>

	* configure.ac:
	* plugins/media-keys/actions/Makefile.am: hook up the Thinkpad support


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/media-keys/actions/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Apr  5 10:44:01 2008
@@ -315,6 +315,24 @@
 
 AM_CONDITIONAL(HAVE_ALSA, test x"$have_alsa" = "xyes")
 
+dnl ==============================================
+dnl IBM Thinkpad support
+dnl ==============================================
+
+AC_ARG_ENABLE(thinkpad,
+	      AC_HELP_STRING([--disable-thinkpad],
+			     [disable IBM Thinkpad hardware volume button support]),
+			     [case "${enableval}" in
+			     yes) WANT_THINKPAD=yes ;;
+			     no)  WANT_THINKPAD=no ;;
+			     *) AC_MSG_ERROR(bad value ${enableval} for --enable-thinkpad) ;;
+			     esac],
+			     [WANT_THINKPAD=yes]) dnl Default value
+
+if test "x$WANT_THINKPAD" = xyes; then
+  AC_DEFINE(ENABLE_IBM_THINKPAD, 1, [Define to enable Thinkpad hardware volume buttons support])
+fi
+AM_CONDITIONAL(ENABLE_IBM_THINKPAD, test "x$WANT_THINKPAD" = "xyes")
 
 # ---------------------------------------------------------------------------
 # Enable Profiling

Modified: trunk/plugins/media-keys/actions/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/actions/Makefile.am	(original)
+++ trunk/plugins/media-keys/actions/Makefile.am	Sat Apr  5 10:44:01 2008
@@ -61,6 +61,13 @@
 endif # HAVE_ALSA
 endif # HAVE_GSTREAMER
 
+if ENABLE_IBM_THINKPAD
+libacme_la_SOURCES += \
+	acme-volume-thinkpad.c \
+	acme-volume-thinkpad.h \
+	$(NULL)
+endif
+
 gladedir = $(pkgdatadir)
 glade_DATA = 		\
 	acme.glade	\
@@ -72,7 +79,6 @@
 	$(NULL)
 
 EXTRA_DIST =			\
-	acme.h			\
 	$(glade_DATA)		\
 	$(pixmaps_DATA)		\
 	$(NULL)