1--- misc/apr-util-1.4.1/build/apu-conf.m4	2011-08-08 11:32:27.000000000 +0200
2+++ misc/build/apr-util-1.4.1/build/apu-conf.m4	2012-02-22 16:39:05.000000000 +0100
3@@ -87,8 +87,13 @@
4 dnl
5 AC_DEFUN([APU_SYSTEM_EXPAT], [
6
7+  APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
8+     [expat.h], [-lexpat_xmlparse -lexpat_xmltok])
9+
10+  if test $apu_has_expat = 0; then
11   APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system,
12     [expat.h], [-lexpat])
13+  fi
14
15   if test $apu_has_expat = 0; then
16     APU_TRY_EXPAT_LINK([old Debian-packaged expat], apu_cv_expat_debian,
17