summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2017-05-04 20:16:03 +0200
committerDavid Tardon <dtardon@redhat.com>2017-05-05 08:24:50 +0200
commit3b39adee1965be05e4bae759f43f77ce530f326c (patch)
treeb9cb9f4ce4fdfdce83706ee403f29c2cf577d4d3 /configure.ac
parent074fd0fed18f6ffcd5c9e33e75f820e9c769abc9 (diff)
mingw is dead and buried
Change-Id: Id64d7b3b4af56fd696eba497837399ab912e35af
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac17
1 files changed, 1 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac
index c15fa5582f59..900a9f87f89e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7838,22 +7838,7 @@ AC_SUBST(CLUCENE_LIBS)
dnl ===================================================================
dnl Check for system expat
dnl ===================================================================
-dnl we should use libo_CHECK_SYSTEM_MODULE, but e.g. the mingw tinderbox had no
-dnl proper pkg-config for it. It should really be fixed on the tinderbox though.
-AC_MSG_CHECKING([which expat to use])
-if test "$with_system_expat" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_EXPAT=TRUE
- AC_CHECK_HEADER(expat.h, [],
- [AC_MSG_ERROR(expat.h not found. install expat)], [])
- AC_CHECK_LIB([expat], [XML_ParserCreate], [:],
- [AC_MSG_RESULT(expat library not found or functional.)], [])
-else
- AC_MSG_RESULT([internal])
- SYSTEM_EXPAT=
- BUILD_TYPE="$BUILD_TYPE EXPAT"
-fi
-AC_SUBST(SYSTEM_EXPAT)
+libo_CHECK_SYSTEM_MODULE([expat], [EXPAT], [expat])
AC_MSG_CHECKING([whether to enable Embedded OpenType support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_eot" = "yes"; then