qiurui
/
input-remote-protocol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop evtest-capture references in autotools 

evtest-capture has been dropped, but the references are still there in
Makefile.am and configure.ac. In a system having libxml, the make command
returns without being able to compile evtest-capture.o

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Benjamin Tissoires 2013-03-13 16:57:33 +01:00 committed by Peter Hutterer
parent 228fcb5c9d
commit 65520efa7e
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -2,16 +2,6 @@
bin_PROGRAMS = evtest bin_PROGRAMS = evtest
man_pages_src = evtest.txt man_pages_src = evtest.txt
if HAVE_LIBXML
bin_PROGRAMS += evtest-capture
AM_CFLAGS = $(XML_CFLAGS)
evtest_capture_LDADD = $(XML_LIBS)
man_pages_src += evtest-capture.txt
evtest_capturedir = $(datadir)/evtest
dist_evtest_capture_DATA = evtest-create-device.xsl
endif
EXTRA_DIST = INSTALL EXTRA_DIST = INSTALL
# man page generation. # man page generation.

9
configure.ac
View File

@ -7,15 +7,6 @@ AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
AC_ARG_ENABLE([xml], [AS_HELP_STRING([--disable-xml], [Disable support for xml (evtest-capture)])])
AS_IF([test "x$enable_xml" != "xno"], [
PKG_CHECK_MODULES(XML, libxml-2.0, [HAVE_LIBXML=yes], [HAVE_LIBXML=no])
AS_IF([test "x$enable_xml$HAVE_LIBXML" = "xyesno"], [
AC_MSG_ERROR([libxml headers not available. Cannot build evtest-capture.])
])
])
AM_CONDITIONAL(HAVE_LIBXML, [test "x$HAVE_LIBXML" = "xyes"])
AC_PATH_PROG(XSLTPROC, [xsltproc]) AC_PATH_PROG(XSLTPROC, [xsltproc])
AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"])
if test "x$XSLTPROC" = "x"; then if test "x$XSLTPROC" = "x"; then