[G15daemon-commits] SF.net SVN: g15daemon: [334] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 334
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=334&view=rev
Author:   mlampard
Date:     2007-12-07 06:08:03 -0800 (Fri, 07 Dec 2007)

Log Message:
-----------
dont compile uinput plugin if required headers are non-existant.

Modified Paths:
--------------
    trunk/g15daemon-wip/configure.in
    trunk/g15daemon-wip/plugins/Makefile.am

Modified: trunk/g15daemon-wip/configure.in
===================================================================
--- trunk/g15daemon-wip/configure.in	2007-12-02 03:50:57 UTC (rev 333)
+++ trunk/g15daemon-wip/configure.in	2007-12-07 14:08:03 UTC (rev 334)
@@ -32,6 +32,7 @@
 #include <linux/input.h>
 #endif
 ])
+
 #if HAVE_LINUX_UINPUT_H 
 	dnl check for uinput.h version 2.4 or 2.6 ?
 	AC_CHECK_MEMBER([struct uinput_user_dev.id],
@@ -42,9 +43,12 @@
 			#include <linux/uinput.h>
 	     ]
 	)
+	uinput=true
 	dnl end of uinput version checks
 #endif
 
+AM_CONDITIONAL(UINPUT_INTERFACE_PLUGIN, [test x$uinput = xtrue])
+
 case $host_os in
 	*linux*) 
 	  AC_DEFINE([OSTYPE_LINUX], [1],[Target OS is Linux])

Modified: trunk/g15daemon-wip/plugins/Makefile.am
===================================================================
--- trunk/g15daemon-wip/plugins/Makefile.am	2007-12-02 03:50:57 UTC (rev 333)
+++ trunk/g15daemon-wip/plugins/Makefile.am	2007-12-07 14:08:03 UTC (rev 334)
@@ -3,12 +3,15 @@
 libdir = @G15DAEMON_PLUGIN_DIR@
 AM_CFLAGS = -Wall
 
-lib_LTLIBRARIES =g15plugin_uinput.la g15plugin_tcpserver.la g15plugin_clock.la
-INCLUDES = -I$(top_builddir)/libg15daemon_client/ -I$(top_builddir)/g15daemon
-
+if UINPUT_INTERFACE_PLUGIN
 g15plugin_uinput_la_SOURCES = g15_plugin_uinput.c
 g15plugin_uinput_la_LDFLAGS = -avoid-version -module 
+input_la = g15plugin_uinput.la
+endif
 
+lib_LTLIBRARIES = ${input_la} g15plugin_tcpserver.la g15plugin_clock.la
+INCLUDES = -I$(top_builddir)/libg15daemon_client/ -I$(top_builddir)/g15daemon
+
 g15plugin_tcpserver_la_SOURCES = g15_plugin_net.c
 g15plugin_tcpserver_la_LDFLAGS = -avoid-version -module 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.