diff options
author | David Tardon <dtardon@redhat.com> | 2014-12-23 18:37:54 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2014-12-24 14:48:24 +0100 |
commit | c868a0c772a980dcc3045315c1e6f97f1433e88d (patch) | |
tree | 508908663af2a4c66f99b37d79b3cccee989f1b5 /configure.ac | |
parent | baa6458c8b1063e3b06f3d6d6ccef54f7e9250dd (diff) |
build bundled libwpd and libwpg as shared libs
Change-Id: I7a00dfaa3252e2a0ab145ef8a4355f9bd14570da
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 02f589274e33..8aa33d043998 100644 --- a/configure.ac +++ b/configure.ac @@ -7562,7 +7562,11 @@ AC_SUBST(ENABLE_CMIS) dnl =================================================================== dnl Check for system libwpd dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs -lwpd-0.10"]) +AS_IF([test "$COM" = "MSC"], + [libwpd_libdir="${WORKDIR}/LinkTarget/Library"], + [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"] +) +libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir} -lwpd-0.10"]) dnl =================================================================== dnl Check for system lcms2 |