version 1.6

wojdyr · Sep 14, 2020 · 157f7e6 · 157f7e6
1 parent 88c7900
commit 157f7e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/README.rst b/README.rst
@@ -32,6 +32,8 @@ Supported formats:
    *(only 1-D data is supported)*
 - χPLOT CHI_
 - Ron Unwin's Spectra XPS format (VGX-900 compatible)
+- Freiberg Instruments XSYG (from lexsyg)
+- Bruker SPC/PAR
 
 .. _CHI: http://www.esrf.eu/computing/scientific/FIT2D/FIT2D_REF/node115.html#SECTION0001851500000000000000
 
@@ -113,7 +115,7 @@ __ https://github.com/wojdyr/xylib/releases
 * `tarball`_
 * GitHub repository_ |travis-status|_ |appveyor-status|_
 
-.. _`tarball`: https://github.com/wojdyr/xylib/releases/download/v1.5/xylib-1.5.tar.bz2
+.. _`tarball`: https://github.com/wojdyr/xylib/releases/download/v1.6/xylib-1.6.tar.bz2
 .. _repository: https://github.com/wojdyr/xylib
 .. _travis-status: https://travis-ci.org/wojdyr/xylib/
 .. |travis-status| image:: https://api.travis-ci.org/wojdyr/xylib.png
@@ -123,7 +125,7 @@ __ https://github.com/wojdyr/xylib/releases
 **To compile** the source code you need:
 
 * C++ compiler (all popular ones are tested: GCC, Clang, MSVC, icc)
-* Boost_ libraries (only headers).
+* Boost_ libraries >= 1.46.1 (only headers).
 * optionally, zlib and bzlib libraries (for reading compressed files)
 * optionally, wxWidgets 3.0 (for xyconvert - GUI converter)
 
@@ -181,7 +183,9 @@ CREDITS
 HISTORY
 =======
 
-* 1.6 (unreleased)
+* 1.6 (2020-09-08)
+  - added XSYG format from Freiberg Instruments' lexsyg (Johannes Friedrich)
+  - added Bruker SPC binary format (Sebastian Kreutzer)
   - added PANalytical XRDML
 
 * 1.5 (2016-12-17)

diff --git a/configure.ac b/configure.ac
@@ -24,6 +24,8 @@ AC_PROG_CXX
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT([disable-static win32-dll])
 
+AM_MAINTAINER_MODE dnl disable (by default) maintainer mode
+
 # Checks for libraries.
 XYLIB_ADDLIB=
 if test "x$with_zlib" != xno; then
@@ -72,6 +74,8 @@ AC_CHECK_HEADER([boost/spirit/version.hpp], [],
                 [AC_MSG_ERROR([Boost::Spirit headers were not found.])])
 AC_CHECK_HEADER([boost/tokenizer.hpp], [],
                 [AC_MSG_ERROR([Boost Tokenizer header not found.])])
+AC_CHECK_HEADER([boost/property_tree/ptree.hpp], [],
+                [AC_MSG_ERROR([Boost PropertyTree header not found.])])
 AC_CHECK_HEADER([sys/types.h], [],
                 [AC_MSG_ERROR([Header sys/types.h not found.
                  Please inform xylib maintainer about this problem,