Require bibtex2html 1.95 and bib2bib 1.95.

	* bootstrap: Here.
	(require): Accept complex command line patterns as third argument
	to handle bibtex2html's and bib2bib's ``--version'' option.

ChangeLog

+2013-06-18  Roland Levillain  <roland@lrde.epita.fr>
+
+	Require bibtex2html 1.95 and bib2bib 1.95.
+
+	* bootstrap: Here.
+	(require): Accept complex command line patterns as third argument
+	to handle bibtex2html's and bib2bib's ``--version'' option.
+
 2013-06-18  Roland Levillain  <roland@lrde.epita.fr>
 
 	Work around constraints of TeXLive's bibtex2html on Mac OS X.

bootstrap

@@ -102,7 +102,8 @@ require ()
 {
   local option
   if test $# -eq 3; then option=$3; else option=--version; fi
-  local version=$($1 $option | sed -n 's/[^0-9.]*\([0-9][0-9.]*\).*/\1/p;q')
+  local version=$(eval "$1 $option" \
+                  | sed -n 's/[^0-9.]*\([0-9][0-9.]*\).*/\1/p;q')
   test x"$version" != x ||
     fatal "$1 (version $2 or better) is required"
   case $(version_compare "$2" "$version") in
@@ -160,6 +161,11 @@ require doxygen 1.5.6
 # with both implementations.
 require convert 1.3.12 -version
 require hevea 1.10 -version
+# Admittedly a bit hacky, but these tools
+# 1. display their version numbers on stderr, not stdout; and
+# 2. contain a digit ("2") in their name, which disturbs `require'.
+require bibtex2html 1.95 "--version 2>&1 | sed 's/bibtex2html//'"
+require bib2bib 1.95 "--version 2>&1 | sed 's/bib2bib//'"
 
 
 # Regen files stored in the repository if asked so.