1--- misc/apr-util-1.5.4/build/apu-conf.m4	2011-08-08 06:32:27.000000000 -0300
2+++ misc/build/apr-util-1.5.4/build/apu-conf.m4	2013-06-12 20:09:05.877947541 -0300
3@@ -87,8 +87,14 @@ dnl be dropped later.
4 dnl
5 AC_DEFUN([APU_SYSTEM_EXPAT], [
6
7+  APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
8+     [expat.h], [-L"$SOLARLIBDIR" -lexpat_xmlparse -lexpat_xmltok],
9+     [APR_ADDTO(APRUTIL_INCLUDES, [-I"$SOLARINCDIR"/external])] )
10+
11+  if test $apu_has_expat = 0; then
12   APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system,
13     [expat.h], [-lexpat])
14+  fi
15
16   if test $apu_has_expat = 0; then
17     APU_TRY_EXPAT_LINK([old Debian-packaged expat], apu_cv_expat_debian,
18