On 29.09.2010 18:32, Rainer Jung wrote:
On 29.09.2010 13:52, jor...@apache.org wrote:
Author: jorton
Date: Wed Sep 29 11:52:55 2010
New Revision: 1002584
URL: http://svn.apache.org/viewvc?rev=1002584&view=rev
Log:
* xml/expat: Merge changes from expat 1.95.2 -> 1.95.7.
...
Modified:
...
apr/apr-util/branches/1.5.x/xml/expat/buildconf.sh
Modified: apr/apr-util/branches/1.5.x/xml/expat/buildconf.sh
URL:
http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/xml/expat/buildconf.sh?rev=1002584&r1=1002583&r2=1002584&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.5.x/xml/expat/buildconf.sh Wed Sep 29
11:52:55 2010
@@ -25,7 +25,7 @@ echo "Copying libtool helper files ..."
(cd conftools ; rm -f ltconfig ltmain.sh)
rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
-$libtoolize --copy --automake
+$libtoolize --copy --automake --force
Do we actually want that? Now buildconf.sh overrides our svn provided
and maintained config.guess and config.sub with the ones installed with
libtool, which are often pretty outdated. That might influence
negatively the ability to build expat on modern systems.
My impression is, that those are the only preexisting files, so omitting
"--force" will correctly install all other files, at least if we always
them up during previous buildconf runs.
I removed the flag in r1002732 (1.5) and r1002733 (1.3). I'll revert if
keeping it is better.
Second question: where do we want the libtool m4 files and aclocal.m4
during expat buildconf to be located: in the expat top directory or in
conftools? I had the impression you want them now in conftools, but then
there are some more fixes in the expat buildconf necessary, at least for
libtool 1. I have them ready but want to make sure I understand your
intention.
It looks like acconfig.m4 itself has to stay top level, only the
included files go to the conftools. Fixed some missing "conftools"
pathes in the cited revs and included aclocal.m4 in the final cleanup.
Regards,
Rainer
