diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-07 09:28:06 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-08 10:20:25 +0200 |
| commit | 6d81c8ee3eca3e49cb17f4fa3b6f5732f0facae8 (patch) | |
| tree | 18e1367ecd5f33d91e72b55a9b67144002db5e0d | |
| parent | bdf04730079523303a7c10c7af97ee5f67ad0a92 (diff) | |
Find apr and serf libraries in --enable-dbgutil Windows build.
Change-Id: I06af5605ac5cf8606864b7c42527aa567571341a
(cherry picked from commit 702d79a3f8fd3c5e4b433195908317075c87ad9d)
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 69036cd7cb5e..54fd9f676c05 100644 --- a/configure.ac +++ b/configure.ac @@ -9283,14 +9283,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) |