diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2013-03-13 16:57:33 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-03-14 07:02:36 +1000 |
| commit | 65520efa7ed1792a58615caf7da6d424e8662f17 (patch) | |
| tree | 41a739bca6da5d22ee3a62c128769b091eeba8c3 | |
| parent | 228fcb5c9def6b18fdabf4bd59713a6f6f4259b7 (diff) | |
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>
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index c78d17d..7299c27 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,6 @@ bin_PROGRAMS = evtest 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 # man page generation. diff --git a/configure.ac b/configure.ac index e973733..36a1901 100644 --- a/configure.ac +++ b/configure.ac @@ -7,15 +7,6 @@ AC_PROG_CC AC_PROG_INSTALL 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]) AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) if test "x$XSLTPROC" = "x"; then |