Merge branch 'devel-2.1'

* devel-2.1:
  Enable from-repository builds on old distributions

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Manuel Franceschini <livewire@google.com>

Makefile.am

@@ -482,7 +482,7 @@ man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
 	@test -n "$(DOCBOOK2MAN)" || \
 	  { echo 'docbook2man' not found during configure; exit 1; }
 	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
-	$(CHECK_MAN) $@
+	if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN) $@; fi
 
 man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
 	@test -n "$(DOCBOOK2HTML)" || \

configure.ac

@@ -297,6 +297,17 @@ fi
 
 AC_SUBST(SOCAT_USE_ESCAPE)
 
+if man --help | grep -q -e --warnings
+then
+  MAN_HAS_WARNINGS=1
+else
+  MAN_HAS_WARNINGS=
+  AC_MSG_WARN([man doesn't support --warnings, man pages checks
+               will not be possible])
+fi
+
+AC_SUBST(MAN_HAS_WARNINGS)
+
 # Check for Python
 AM_PATH_PYTHON(2.4)