diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 6742046b54d6..6c78067acb95 100644 --- a/configure.ac +++ b/configure.ac @@ -9164,21 +9164,36 @@ if test "$enable_neon" = "no"; then AC_MSG_RESULT([no]) DISABLE_NEON=TRUE AC_SUBST(DISABLE_NEON) + + # Check for system apr-util + libo_CHECK_SYSTEM_MODULE([apr],[APR],[apr-util-1], + ["-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" + 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" + fi else AC_MSG_RESULT([yes]) -dnl =================================================================== -dnl Check for system neon -dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0]) -if test "$with_system_neon" = "yes"; then - NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" - libo_MINGW_CHECK_DLL([libneon]) - libo_MINGW_TRY_DLL([libtasn1]) - libo_MINGW_TRY_DLL([libgnutls]) -else - NEON_VERSION=0295 -fi -AC_SUBST(NEON_VERSION) + dnl =================================================================== + dnl Check for system neon + dnl =================================================================== + libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0]) + if test "$with_system_neon" = "yes"; then + NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" + libo_MINGW_CHECK_DLL([libneon]) + libo_MINGW_TRY_DLL([libtasn1]) + libo_MINGW_TRY_DLL([libgnutls]) + else + NEON_VERSION=0295 + fi + AC_SUBST(NEON_VERSION) fi dnl =================================================================== |