From 2ebf9de408f3fd629126a20b21221e186195813c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 11 May 2017 12:47:14 +0300
Subject: Add libstudxml version check

---
 libbrep/version.hxx.in |  9 ---------
 mod/buildfile          |  4 ++++
 web/.gitignore         |  1 +
 web/version.hxx.in     | 12 ++++++++++++
 web/xhtml.hxx          |  2 ++
 5 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 web/.gitignore
 create mode 100644 web/version.hxx.in

diff --git a/libbrep/version.hxx.in b/libbrep/version.hxx.in
index 437163f..6ebe13e 100644
--- a/libbrep/version.hxx.in
+++ b/libbrep/version.hxx.in
@@ -57,15 +57,6 @@ $libodb.check(LIBODB_VERSION, LIBODB_SNAPSHOT)$
 
 $libodb-pgsql.check(LIBODB_PGSQL_VERSION, LIBODB_PGSQL_SNAPSHOT)$
 
-// @@ Not really the correct place for the check since we don't use
-//    it here.
-//
-/*
-#include <xml/version>
-
-$libstudxml.check(LIBSTUDXML_VERSION, LIBSTUDXML_SNAPSHOT)$
-*/
-
 // For now these are the same.
 //
 #define LIBBREP_VERSION BREP_VERSION
diff --git a/mod/buildfile b/mod/buildfile
index f845a42..2a71de8 100644
--- a/mod/buildfile
+++ b/mod/buildfile
@@ -40,6 +40,7 @@ mod{brep}:                                                     \
               {hxx         cxx}{ types-parsers               } \
        ../web/{hxx         cxx}{ mime-url-encoding           } \
        ../web/{hxx            }{ module                      } \
+       ../web/{hxx            }{ version                     } \
        ../web/{hxx            }{ xhtml                       } \
        ../web/{hxx         cxx}{ xhtml-fragment              } \
 ../web/apache/{hxx            }{ log                         } \
@@ -48,6 +49,9 @@ mod{brep}:                                                     \
 ../web/apache/{hxx            }{ stream                      } \
 ../libbrep/lib{brep} $libs
 
+../web/hxx{version}: ../web/in{version} $src_root/file{manifest}
+../web/hxx{version}: dist = true
+
 # Don't install any of the module's headers.
 #
 {hxx ixx txx}{*}: install = false
diff --git a/web/.gitignore b/web/.gitignore
new file mode 100644
index 0000000..426db9e
--- /dev/null
+++ b/web/.gitignore
@@ -0,0 +1 @@
+version.hxx
diff --git a/web/version.hxx.in b/web/version.hxx.in
new file mode 100644
index 0000000..90bbaa6
--- /dev/null
+++ b/web/version.hxx.in
@@ -0,0 +1,12 @@
+// file      : web/version.hxx.in -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef WEB_VERSION_HXX_IN
+#define WEB_VERSION_HXX_IN
+
+#include <libstudxml/version.hxx>
+
+$libstudxml.check(LIBSTUDXML_VERSION, LIBSTUDXML_SNAPSHOT)$
+
+#endif // WEB_VERSION_HXX_IN
diff --git a/web/xhtml.hxx b/web/xhtml.hxx
index 878c255..b9ccff3 100644
--- a/web/xhtml.hxx
+++ b/web/xhtml.hxx
@@ -7,6 +7,8 @@
 
 #include <libstudxml/serializer.hxx>
 
+#include <web/version.hxx>
+
 namespace web
 {
   // "Canonical" XHTML5 vocabulary.
-- 
cgit v1.1