diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-15 07:20:13 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-15 07:29:29 +0200 |
| commit | ab03e87741f25d3a5532a75c3dc59b5556a2bb24 (patch) | |
| tree | 037df2994337bde643dd891b8ea3c12498de5bc6 /configure.in | |
| parent | sal_Bool to bool (diff) | |
| download | core-ab03e87741f25d3a5532a75c3dc59b5556a2bb24.tar.gz core-ab03e87741f25d3a5532a75c3dc59b5556a2bb24.zip | |
add build support for libexslt
Change-Id: I539acd19fa8a0dc1a89a7a172ecad2a03ebc5d7b
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 95bd0dbba294..76a29106c390 100644 --- a/configure.in +++ b/configure.in @@ -6721,10 +6721,13 @@ if test "$with_system_libxml" = "yes"; then if test "$_os" = "Darwin"; then dnl make sure to use SDK path LIBXSLT_CFLAGS="-I$MACOSX_SDK_PATH/usr/include/libxml2" + LIBEXSLT_CFLAGS="$LIBXSLT_CFLAGS" dnl omit -L/usr/lib LIBXSLT_LIBS="-lxslt -lxml2 -lz -lpthread -liconv -lm" + LIBEXSLT_LIBS="-lexslt $LIBXSLT_LIBS" else PKG_CHECK_MODULES(LIBXSLT, libxslt) + PKG_CHECK_MODULES(LIBEXSLT, libexslt) fi dnl Check for xsltproc @@ -6734,6 +6737,7 @@ if test "$with_system_libxml" = "yes"; then fi libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt]) + libo_MINGW_CHECK_DLL([LIBEXSLT], [libexslt]) libo_MINGW_TRY_DLL([ICONV], [iconv]) else AC_MSG_RESULT([internal]) @@ -6753,9 +6757,12 @@ if test -z "$SYSTEM_LIBXSLT_FOR_BUILD"; then fi AC_SUBST(SYSTEM_LIBXSLT_FOR_BUILD) +AC_SUBST(LIBEXSLT_CFLAGS) +AC_SUBST(LIBEXSLT_LIBS) AC_SUBST(LIBXSLT_CFLAGS) AC_SUBST(LIBXSLT_LIBS) AC_SUBST(XSLTPROC) +AC_SUBST([MINGW_LIBEXSLT_DLL]) AC_SUBST([MINGW_LIBXSLT_DLL]) AC_SUBST([MINGW_ICONV_DLL]) |