[Libreoffice-commits] libcdr.git: 2 commits - configure.ac src/lib

[Fridrich Å trba]

 configure.ac          |    5 +++--
 src/lib/CDRParser.cpp |    3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3128bbb7b943b40ab3aca2d95c8b202b48242b42
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Apr 25 16:40:29 2013 +0200

    Some sane defaults for the build

diff --git a/configure.ac b/configure.ac
index 5a41e47..68594ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,8 +30,9 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AC_LIBTOOL_WIN32_DLL
+LT_INIT([win32-dll disable-static pic-only])
+AC_CANONICAL_HOST
+
 PKG_PROG_PKG_CONFIG([0.20])
 
 # ====================
commit b4502282333e2109b2e37f8984ac762380fbad64
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 22 19:32:49 2013 +0200

    Assure that we don't link with boost on Windows

diff --git a/src/lib/CDRParser.cpp b/src/lib/CDRParser.cpp
index 8813465..3edcc67 100644
--- a/src/lib/CDRParser.cpp
+++ b/src/lib/CDRParser.cpp
@@ -32,6 +32,9 @@
 #include <string.h>
 #include <sstream>
 #include <set>
+#ifndef BOOST_ALL_NO_LIB
+#define BOOST_ALL_NO_LIB 1
+#endif
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/spirit/include/classic.hpp>