|
Lines 25-31
Link Here
|
| 25 |
# configure.in exist, so we remove all references and include every |
25 |
# configure.in exist, so we remove all references and include every |
| 26 |
# .m4 file in build using aclocal via eautoreconf |
26 |
# .m4 file in build using aclocal via eautoreconf |
| 27 |
# See bug 135463 |
27 |
# See bug 135463 |
| 28 |
sed -i -e '/sinclude/d' configure.in |
28 |
sed -i -e '/sinclude/d' -e 's:LT_VERSION:LLT_VERSION:' -e '/RM, rm/d' configure.in |
|
|
29 |
sed -i -e '/top_blddir=@apr_builddir/a@top_builddir=@apr_builddir@' Makefile.in |
| 30 |
rm "${S}"/build/libtool.m4 |
| 29 |
AT_M4DIR="build" eautoreconf |
31 |
AT_M4DIR="build" eautoreconf |
| 30 |
|
32 |
|
| 31 |
epatch "${FILESDIR}"/config.layout.patch |
33 |
epatch "${FILESDIR}"/config.layout.patch |
|
Lines 62-68
Link Here
|
| 62 |
${myconf} |
64 |
${myconf} |
| 63 |
|
65 |
|
| 64 |
# Make sure we use the system libtool |
66 |
# Make sure we use the system libtool |
| 65 |
sed -i 's,$(apr_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk |
67 |
sed -i 's,$(top_builddir)/libtool,/usr/bin/libtool,' "${S}"/build/apr_rules.mk |
| 66 |
sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config |
68 |
sed -i 's,${installbuilddir}/libtool,/usr/bin/libtool,' "${S}"/apr-1-config |
| 67 |
rm -f "${S}"/libtool |
69 |
rm -f "${S}"/libtool |
| 68 |
|
70 |
|
