diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-09 23:44:47 +0100 |
---|---|---|
committer | Kay Sievers <kay.sievers@vrfy.org> | 2012-01-09 23:44:47 +0100 |
commit | 9e4e44e578ec8ba2c626abed4eb8529814557352 (patch) | |
tree | de46ed4f40128d1981fb7ac84b79b2217be274e1 | |
parent | autogen.sh: add CFLAGS and print entire line, so that mouse copy/paste works (diff) | |
download | systemd-9e4e44e578ec8ba2c626abed4eb8529814557352.tar.gz systemd-9e4e44e578ec8ba2c626abed4eb8529814557352.tar.bz2 systemd-9e4e44e578ec8ba2c626abed4eb8529814557352.zip |
build-sys: try to build without installed xsltproc
-rw-r--r-- | Makefile.am | 5 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 06500b068..46f923ea9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ udevhomedir = $(libexecdir)/udev udevhome_SCRIPTS = dist_udevhome_SCRIPTS = dist_udevhome_DATA = +dist_man_MANS = SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ @@ -259,10 +260,11 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS) src_udevadm_LDADD = $(udev_common_LDADD) src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS) +if HAVE_XSLTPROC # ------------------------------------------------------------------------------ # udev man pages # ------------------------------------------------------------------------------ -dist_man_MANS = \ +dist_man_MANS += \ src/udev.7 \ src/udevadm.8 \ src/udevd.8 @@ -282,6 +284,7 @@ src/%.7 src/%.8 : src/%.xml src/%.html : src/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< +endif # ------------------------------------------------------------------------------ # udev tests diff --git a/configure.ac b/configure.ac index 4ba9964cb..07254feba 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,9 @@ AC_PROG_SED AC_PROG_MKDIR_P GTK_DOC_CHECK(1.10) AC_PREFIX_DEFAULT([/usr]) + AC_PATH_PROG([XSLTPROC], [xsltproc]) +AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([POSIX RT library not found])]) |