View | Details | Raw Unified | Return to bug 41192
Collapse All | Expand All

(-)2.2.x/srclib/apr-util/build/apu-conf.m4 (-2 / +4 lines)
Lines 197-203 if test "$expat_include_dir" = "xml/expa Link Here
197 
  expat_libs="-lexpat"
 197 
  expat_libs="-lexpat"
198 
  expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
 198 
  expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
199 
  APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
 199 
  APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
200 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libtool])
 200 
  APR_ADDTO(LT_LDFLAGS, [$expat_libtool])
201 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
201 
else
 202 
else
202 
if test "$expat_include_dir" = "$abs_srcdir/xml/expat/include" -o "$expat_include_dir" = "$abs_srcdir/xml/expat/lib"; then
 203 
if test "$expat_include_dir" = "$abs_srcdir/xml/expat/include" -o "$expat_include_dir" = "$abs_srcdir/xml/expat/lib"; then
203 
  dnl This is a bit of a hack.  This only works because we know that
 204 
  dnl This is a bit of a hack.  This only works because we know that
Lines 209-215 if test "$expat_include_dir" = "$abs_src Link Here
209 
  expat_libs="-lexpat"
 210 
  expat_libs="-lexpat"
210 
  expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
 211 
  expat_libtool=$top_builddir/$bundled_subdir/lib/libexpat.la
211 
  APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
 212 
  APR_XML_SUBDIRS="`echo $bundled_subdir | sed -e 's%xml/%%'`"
212 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libtool])
 213 
  APR_ADDTO(LT_LDFLAGS, [$expat_libtool])
214 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
213 
else
 215 
else
214 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
 216 
  APR_ADDTO(APRUTIL_EXPORT_LIBS, [$expat_libs])
215 
fi
 217 
fi

Return to bug 41192