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