summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2007-05-02 14:49:47 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2007-05-02 14:49:47 -0700
commit1ff9d8a7c9e5ab784b0bed38e968b3d56c434cad (patch)
tree0fbbf03bd84b0877a636ce8c0bb5b6b46408b810
parent81a8a71d888d16989a096195dfd96b10fadeba5d (diff)
Give more explicit warning messages if xmlto is needed but not found
-rw-r--r--configure.ac3
-rw-r--r--man/Makefile.am11
2 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 62100d4..dd50ea4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,6 +47,9 @@ AC_PROG_LIBTOOL
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_PATH_PROG([XMLTO], [xmlto])
AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
+if test "x$XMLTO" = "x" -a ! -f $srcdir/man/Xcomposite.man ; then
+ AC_MSG_WARN([xmlto not found - cannot create man pages without it])
+fi
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
diff --git a/man/Makefile.am b/man/Makefile.am
index 0cd6d0a..8ff4f37 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -59,7 +59,7 @@ MAN_SUBSTS = \
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
.man.$(LIB_MAN_SUFFIX):
sed $(MAN_SUBSTS) < $< > $@
@@ -69,10 +69,9 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man
dist-hook: $(libman_PRE)
if HAVE_XMLTO
-SUFFIXES += .xml
-
.xml.man:
$(XMLTO) man $< && mv $*.__libmansuffix__ $@
-
-
-endif HAVE_XMLTO
+else
+.xml.man:
+ @echo "WARNING: configure did not find xmlto, cannot create $@ without it"
+endif