[Libreoffice-commits] .: configure.in

David Tardon dtardon at kemper.freedesktop.org
Wed Jun 13 09:28:46 PDT 2012


 configure.in |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 9ea4189c507455caebaf1c96457b98cac789584a
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jun 13 18:28:29 2012 +0200

    mingw: fix check for boost date_time dll
    
    Change-Id: I4a31c215d70e6f8f8fc8a768851315b919fba03e

diff --git a/configure.in b/configure.in
index 36f99bd..c496eac 100644
--- a/configure.in
+++ b/configure.in
@@ -7335,7 +7335,12 @@ if test "$with_system_boost" = "yes"; then
     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])
+    libo_MINGW_TRY_DLL([BOOST_DATE_TIME], [$mingw_boost_date_time_dll])
+    if test -z "$MINGW_BOOST_DATE_TIME_DLL"; then
+        # if not found, try again with 'lib' prefix
+        libo_MINGW_CHECK_DLL([BOOST_DATE_TIME],
+                             [lib$mingw_boost_date_time_dll])
+    fi
 else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE BOOST"


More information about the Libreoffice-commits mailing list