1*257b46faSpfg--- misc/apr-util-1.5.4/build/apu-conf.m4	2011-08-08 06:32:27.000000000 -0300
2*257b46faSpfg+++ misc/build/apr-util-1.5.4/build/apu-conf.m4	2013-06-12 20:09:05.877947541 -0300
356ff6264SAriel Constenla-Haile@@ -87,8 +87,14 @@ dnl be dropped later.
47d43dd75SAndre Fischer dnl
57d43dd75SAndre Fischer AC_DEFUN([APU_SYSTEM_EXPAT], [
67d43dd75SAndre Fischer
77d43dd75SAndre Fischer+  APU_TRY_EXPAT_LINK([OpenOffice expat], apu_cv_expat_openoffice,
856ff6264SAriel Constenla-Haile+     [expat.h], [-L"$SOLARLIBDIR" -lexpat_xmlparse -lexpat_xmltok],
956ff6264SAriel Constenla-Haile+     [APR_ADDTO(APRUTIL_INCLUDES, [-I"$SOLARINCDIR"/external])] )
107d43dd75SAndre Fischer+
117d43dd75SAndre Fischer+  if test $apu_has_expat = 0; then
127d43dd75SAndre Fischer   APU_TRY_EXPAT_LINK([Expat 1.95.x], apu_cv_expat_system,
137d43dd75SAndre Fischer     [expat.h], [-lexpat])
147d43dd75SAndre Fischer+  fi
157d43dd75SAndre Fischer
167d43dd75SAndre Fischer   if test $apu_has_expat = 0; then
177d43dd75SAndre Fischer     APU_TRY_EXPAT_LINK([old Debian-packaged expat], apu_cv_expat_debian,
18