[Libreoffice-commits] core.git: configure.ac

[Matúš Kukan]

 configure.ac |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 702d79a3f8fd3c5e4b433195908317075c87ad9d
Author: Matúš Kukan <matus.ku...@collabora.com>
Date:   Mon Apr 7 09:28:06 2014 +0200

    Find apr and serf libraries in --enable-dbgutil Windows build.
    
    Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a

diff --git a/configure.ac b/configure.ac
index 940d260..c05271e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9155,14 +9155,18 @@ serf)
                              ["-I${WORKDIR}/UnpackedTarball/apr/include 
-I${WORKDIR}/UnpackedTarball/apr_util/include"],
                              ["-L${WORKDIR}/UnpackedTarball/apr/.libs -lapr-1 
-L${WORKDIR}/UnpackedTarball/apr_util/.libs -laprutil-1"])
     if test "$COM" = "MSC"; then
-        APR_LIBS="${WORKDIR}/UnpackedTarball/apr/LibR/apr-1.lib 
${WORKDIR}/UnpackedTarball/apr_util/LibR/aprutil-1.lib"
+        APR_LIB_DIR="LibR"
+        test -n "MSVC_USE_DEBUG_RUNTIME" && APR_LIB_DIR="LibD"
+        APR_LIBS="${WORKDIR}/UnpackedTarball/apr/${APR_LIB_DIR}/apr-1.lib 
${WORKDIR}/UnpackedTarball/apr_util/${APR_LIB_DIR}/aprutil-1.lib"
     fi
 
     # Check for system serf
     libo_CHECK_SYSTEM_MODULE([serf],[SERF],[serf-1 >= 
1.1.0],["-I${WORKDIR}/UnpackedTarball/serf"],
                              ["-L${WORKDIR}/UnpackedTarball/serf/.libs 
-lserf-1"])
     if test "$COM" = "MSC"; then
-        SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/Release/serf-1.lib"
+        SERF_LIB_DIR="Release"
+        test -n "MSVC_USE_DEBUG_RUNTIME" && SERF_LIB_DIR="Debug"
+        SERF_LIBS="${WORKDIR}/UnpackedTarball/serf/${SERF_LIB_DIR}/serf-1.lib"
     fi
     ;;
 neon)

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits