better test for system boost date_time lib

This reverts commit 4c2e9fc6.

Change-Id: Iea84991ee689240fe6e6ddbc47f44b444f582dde

RepositoryExternal.mk

@@ -273,7 +273,19 @@ endif # SYSTEM_HUNSPELL
 ifeq ($(SYSTEM_BOOST),YES)
 
 define gb_LinkTarget__use_boostdatetime
-$(call gb_LinkTarget_add_libs,$(1),-lboost_date_time)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	$(BOOST_CPPFLAGS) \
+)
+
+$(call gb_LinkTarget_add_ldflags,$(1),\
+	$(BOOST_LDFLAGS) \
+)
+
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(BOOST_DATE_TIME_LIB) \
+)
+
 endef
 
 else # !SYSTEM_BOOST

config_host.mk.in

@@ -22,6 +22,9 @@ export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
 export AWTLIB=@AWTLIB@
 export BARCODE_EXTENSION_PACK=@BARCODE_EXTENSION_PACK@
+export BOOST_CPPFLAGS=@BOOST_CPPFLAGS@
+export BOOST_DATE_TIME_LIB=@BOOST_DATE_TIME_LIB@
+export BOOST_LDFLAGS=@BOOST_LDFLAGS@
 export BSH_JAR=@BSH_JAR@
 export BUILD_DMAKE=@BUILD_DMAKE@
 export BUILD_EPM=@BUILD_EPM@
@@ -295,6 +298,7 @@ export MFC_INCLUDE=@MFC_INCLUDE@
 export MFC_LIB=@MFC_LIB@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@
+export MINGW_BOOST_DATE_TIME_DLL=@MINGW_BOOST_DATE_TIME_DLL@
 export MINGW_CAIRO_DLL=@MINGW_CAIRO_DLL@
 export MINGW_CLIB_DIR=@MINGW_CLIB_DIR@
 export MINGW_CRYPTO_DLL=@MINGW_CRYPTO_DLL@

configure.in

@@ -7331,6 +7331,11 @@ if test "$with_system_boost" = "yes"; then
     fi
     CXXFLAGS=$save_CXXFLAGS
     AC_LANG_POP([C++])
+
+    AX_BOOST_BASE
+    AX_BOOST_DATE_TIME
+    mingw_boost_date_time_dll=`echo $BOOST_DATE_TIME_LIB | sed -e 's/^-l//' -e 's/\.dll$//'`
+    libo_MINGW_CHECK_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
 else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE BOOST"
@@ -7338,6 +7343,7 @@ else
     HAVE_BOOST_UNORDERED_MAP=TRUE
 fi
 AC_SUBST([HAVE_BOOST_UNORDERED_MAP])
+AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
 AC_SUBST(SYSTEM_BOOST)
 
 dnl ===================================================================

external/mingw-dlls/makefile.mk

@@ -42,6 +42,7 @@ dummy:
 .ELSE
 
 MINGW_DLLS:= \
+    $(MINGW_BOOST_DATE_TIME_DLL) \
     $(MINGW_CAIRO_DLL) \
     $(MINGW_CRYPTO_DLL) \
     $(MINGW_CURL_DLL) \

m4/ax_boost_date_time.m4

+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_boost_date_time.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_BOOST_DATE_TIME
+#
+# DESCRIPTION
+#
+#   Test for Date_Time library from the Boost C++ libraries. The macro
+#   requires a preceding call to AX_BOOST_BASE. Further documentation is
+#   available at <http://randspringer.de/boost/index.html>.
+#
+#   This macro calls:
+#
+#     AC_SUBST(BOOST_DATE_TIME_LIB)
+#
+#   And sets:
+#
+#     HAVE_BOOST_DATE_TIME
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2008 Michael Tindal
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 21
+
+AC_DEFUN([AX_BOOST_DATE_TIME],
+[
+	AC_ARG_WITH([boost-date-time],
+	AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@],
+                   [use the Date_Time library from boost - it is possible to specify a certain library for the linker
+                        e.g. --with-boost-date-time=boost_date_time-gcc-mt-d-1_33_1 ]),
+        [
+        if test "$withval" = "no"; then
+			want_boost="no"
+        elif test "$withval" = "yes"; then
+            want_boost="yes"
+            ax_boost_user_date_time_lib=""
+        else
+		    want_boost="yes"
+		ax_boost_user_date_time_lib="$withval"
+		fi
+        ],
+        [want_boost="yes"]
+	)
+
+	if test "x$want_boost" = "xyes"; then
+        AC_REQUIRE([AC_PROG_CC])
+		CPPFLAGS_SAVED="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+		export CPPFLAGS
+
+		LDFLAGS_SAVED="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+		export LDFLAGS
+
+        AC_CACHE_CHECK(whether the Boost::Date_Time library is available,
+					   ax_cv_boost_date_time,
+        [AC_LANG_PUSH([C++])
+		 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/date_time/gregorian/gregorian_types.hpp>]],
+                                   [[using namespace boost::gregorian; date d(2002,Jan,10);
+                                     return 0;
+                                   ]])],
+         ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
+         AC_LANG_POP([C++])
+		])
+		if test "x$ax_cv_boost_date_time" = "xyes"; then
+			AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available])
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+            if test "x$ax_boost_user_date_time_lib" = "x"; then
+                for libextension in `ls $BOOSTLIBDIR/libboost_date_time*.so* $BOOSTLIBDIR/libboost_date_time*.dylib* $BOOSTLIBDIR/libboost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                 [link_date_time="no"])
+				done
+                if test "x$link_date_time" != "xyes"; then
+                for libextension in `ls $BOOSTLIBDIR/boost_date_time*.dll* $BOOSTLIBDIR/boost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 's;^\(boost_date_time.*\)\.a.*$;\1;'` ; do
+                     ax_lib=${libextension}
+				    AC_CHECK_LIB($ax_lib, exit,
+                                 [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                 [link_date_time="no"])
+				done
+                fi
+
+            else
+               for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
+				      AC_CHECK_LIB($ax_lib, main,
+                                   [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
+                                   [link_date_time="no"])
+                  done
+
+            fi
+            if test "x$ax_lib" = "x"; then
+                AC_MSG_ERROR(Could not find a version of the library!)
+            fi
+			if test "x$link_date_time" != "xyes"; then
+				AC_MSG_ERROR(Could not link against $ax_lib !)
+			fi
+		fi
+
+		CPPFLAGS="$CPPFLAGS_SAVED"
+	LDFLAGS="$LDFLAGS_SAVED"
+	fi
+])

scp2/InstallModule_ooo.mk

@@ -48,6 +48,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_OPENGL \
 	ENABLE_XMLSEC \
 	MERGELIBS \
+	SYSTEM_BOOST \
 	SYSTEM_CAIRO \
 	SYSTEM_CLUCENE \
 	SYSTEM_CURL \
@@ -90,6 +91,7 @@ $(eval $(call gb_InstallModule_define_value_if_set,scp2/ooo,\
 ))
 
 $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
+	MINGW_BOOST_DATE_TIME_DLL \
 	MINGW_CAIRO_DLL \
 	MINGW_CRYPTO_DLL \
 	MINGW_CURL_DLL \

scp2/source/ooo/mingw_dlls.scp

@@ -223,6 +223,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Liblcms2, MINGW_LCMS2_DLL )
 #endif
 #endif
 
+#if defined SYSTEM_BOOST
+#if defined NEEDS_MINGW_BOOST_DATE_TIME_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DLL )
+#endif
+#endif
+
 #if defined(MINGW_GCCDLL)
 
 File gid_Brand_File_Lib_Mingw_GccS