You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by wr...@apache.org on 2009/11/13 00:20:20 UTC
svn commit: r835634 - in /apr/apr-util/branches/1.4.x: buildconf
xml/expat/buildconf.sh xml/expat/configure.in
Author: wrowe
Date: Thu Nov 12 23:20:20 2009
New Revision: 835634
URL: http://svn.apache.org/viewvc?rev=835634&view=rev
Log:
Fix expat libtool'ization (2.2.6) and allow buildconf --verbose'ity
Modified:
apr/apr-util/branches/1.4.x/buildconf
apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
apr/apr-util/branches/1.4.x/xml/expat/configure.in
Modified: apr/apr-util/branches/1.4.x/buildconf
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/buildconf?rev=835634&r1=835633&r2=835634&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/buildconf (original)
+++ apr/apr-util/branches/1.4.x/buildconf Thu Nov 12 23:20:20 2009
@@ -17,6 +17,11 @@
#
#
+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+ verbose="--verbose"
+ shift
+fi
+
# Default place to look for apr source. Can be overridden with
# --with-apr=[directory]
apr_src_dir=../apr
@@ -67,11 +72,11 @@
# Generate the autoconf header (include/apu_config.h) and ./configure
#
echo "Creating include/private/apu_config.h ..."
-${AUTOHEADER:-autoheader}
+${AUTOHEADER:-autoheader} $verbose
echo "Creating configure ..."
### do some work to toss config.cache?
-if ${AUTOCONF:-autoconf}; then
+if ${AUTOCONF:-autoconf} $verbose; then
:
else
echo "autoconf failed"
@@ -82,14 +87,14 @@
# Generate build-outputs.mk for the build system
#
echo "Generating 'make' outputs ..."
-$apr_src_dir/build/gen-build.py make
+$apr_src_dir/build/gen-build.py $verbose make
#
# If Expat has been bundled, then go and configure the thing
#
if [ -f xml/expat/buildconf.sh ]; then
echo "Invoking xml/expat/buildconf.sh ..."
- (cd xml/expat; ./buildconf.sh)
+ (cd xml/expat; ./buildconf.sh $verbose)
fi
# Remove autoconf cache again
Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=835634&r1=835633&r2=835634&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Thu Nov 12 23:20:20 2009
@@ -1,5 +1,10 @@
#! /bin/sh
+if [ "$1" = "--verbose" -o "$1" = "-v" ]; then
+ verbose="--verbose"
+ shift
+fi
+
#
# Find libtoolize. Prefer 1.x versions.
#
@@ -25,7 +30,7 @@
(cd conftools ; rm -f ltconfig ltmain.sh)
rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
-$libtoolize --copy --automake
+$libtoolize --copy --automake --force $verbose
#
# Build aclocal.m4 from libtool's libtool.m4
@@ -42,12 +47,12 @@
cat $ltfile >> aclocal.m4
if [ -f ltsugar.m4 ]; then
- echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
- cat ltsugar.m4 >> aclocal.m4
+ rm -f conftools/ltsugar.m4
+ mv ltsugar.m4 conftools/ltsugar.m4
fi
-# Clean up again
-rm -f libtool.m4 ltsugar.m4
+# Clean up any leftovers
+rm -f aclocal.m4 libtool.m4
cross_compile_warning="warning: AC_TRY_RUN called without default to allow cross compiling"
@@ -55,11 +60,11 @@
# Generate the autoconf header template (config.h.in) and ./configure
#
echo "Creating config.h.in ..."
-${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOHEADER:-autoheader} $verbose 2>&1 | grep -v "$cross_compile_warning"
echo "Creating configure ..."
### do some work to toss config.cache?
-${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+${AUTOCONF:-autoconf} $verbose 2>&1 | grep -v "$cross_compile_warning"
# Remove autoconf caches
rm -rf autom4te*.cache
Modified: apr/apr-util/branches/1.4.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/configure.in?rev=835634&r1=835633&r2=835634&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/configure.in Thu Nov 12 23:20:20 2009
@@ -12,6 +12,14 @@
AC_INIT(Makefile.in)
AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(conftools)
+
+sinclude(conftools/libtool.m4)
+sinclude(conftools/ltsugar.m4)
+sinclude(conftools/argz.m4)
+sinclude(conftools/ltoptions.m4)
+sinclude(conftools/ltversion.m4)
+sinclude(conftools/lt~obsolete.m4)
dnl
dnl Follow the GNU/Linux convention of odd number minor version for
Re: svn commit: r835634 - in /apr/apr-util/branches/1.4.x: buildconf
xml/expat/buildconf.sh xml/expat/configure.in
Posted by Jeff Trawick <tr...@gmail.com>.
On Mon, Nov 16, 2009 at 12:01 PM, William A. Rowe Jr.
<wr...@rowe-clan.net> wrote:
> Jeff Trawick wrote:
>>>
>>> Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
>>> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=835634&r1=835633&r2=835634&view=diff
>>> ==============================================================================
>>> --- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original)
>>> +++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Thu Nov 12 23:20:20 2009
>>
>>> @@ -42,12 +47,12 @@
>>> cat $ltfile >> aclocal.m4
>>>
>>> if [ -f ltsugar.m4 ]; then
>>> - echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
>>> - cat ltsugar.m4 >> aclocal.m4
>>> + rm -f conftools/ltsugar.m4
>>> + mv ltsugar.m4 conftools/ltsugar.m4
>>> fi
>>>
>>> -# Clean up again
>>> -rm -f libtool.m4 ltsugar.m4
>>> +# Clean up any leftovers
>>> +rm -f aclocal.m4 libtool.m4
>>
>> removing aclocal.m4 is a killer for me with
>>
>> - Solaris 10
>> - in-tree expat
>> - autoconf 2.61
>> - libtool 1.5.26
>> - automake 1.11
>
> That's cut and paste from apr, hrmmm. Happy to take a second look at this.
>
>> AC_PROG_LIBTOOL and AC_LIBTOOL_WIN32_DLL aren't found.
>>
>> Find the discussions around r388605 too ;)
>
> So not 'in general', only after libtoolizing them rm'ing aclocal.m4?
I'm not sure what you mean here... we create aclocal.m4 based on
libtool.m4 then whack it almost immediately; aclocal.m4 is where
autoconf would find AC_PROG_LIBTOOL et al.
> I will go
> back and take a second look at what we did in apr-1.x vs xml/expat/
>
apr is a little different... it uses libtool.m4 to create
build/libtool.m4, and APR's configure.in does
sinclude(build/libtool.m4).
hmmm... you changed xml/expat/configure.in to
sinclude(conftools/libtool.m4); I guess conftools is where you
expected it to be?
libtoolize (1.5.26) doesn't create libtool.m4 anywhere in the
xml/expat tree; it ends up being copied from libtool's
share/aclocal/libtool.m4 to aclocal.m4
Re: svn commit: r835634 - in /apr/apr-util/branches/1.4.x: buildconf
xml/expat/buildconf.sh xml/expat/configure.in
Posted by "William A. Rowe Jr." <wr...@rowe-clan.net>.
Jeff Trawick wrote:
>>
>> Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
>> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=835634&r1=835633&r2=835634&view=diff
>> ==============================================================================
>> --- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original)
>> +++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Thu Nov 12 23:20:20 2009
>
>> @@ -42,12 +47,12 @@
>> cat $ltfile >> aclocal.m4
>>
>> if [ -f ltsugar.m4 ]; then
>> - echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
>> - cat ltsugar.m4 >> aclocal.m4
>> + rm -f conftools/ltsugar.m4
>> + mv ltsugar.m4 conftools/ltsugar.m4
>> fi
>>
>> -# Clean up again
>> -rm -f libtool.m4 ltsugar.m4
>> +# Clean up any leftovers
>> +rm -f aclocal.m4 libtool.m4
>
> removing aclocal.m4 is a killer for me with
>
> - Solaris 10
> - in-tree expat
> - autoconf 2.61
> - libtool 1.5.26
> - automake 1.11
That's cut and paste from apr, hrmmm. Happy to take a second look at this.
> AC_PROG_LIBTOOL and AC_LIBTOOL_WIN32_DLL aren't found.
>
> Find the discussions around r388605 too ;)
So not 'in general', only after libtoolizing them rm'ing aclocal.m4? I will go
back and take a second look at what we did in apr-1.x vs xml/expat/
Re: svn commit: r835634 - in /apr/apr-util/branches/1.4.x: buildconf
xml/expat/buildconf.sh xml/expat/configure.in
Posted by Jeff Trawick <tr...@gmail.com>.
On Thu, Nov 12, 2009 at 6:20 PM, <wr...@apache.org> wrote:
> Author: wrowe
> Date: Thu Nov 12 23:20:20 2009
> New Revision: 835634
>
> URL: http://svn.apache.org/viewvc?rev=835634&view=rev
> Log:
> Fix expat libtool'ization (2.2.6) and allow buildconf --verbose'ity
>
> Modified:
> apr/apr-util/branches/1.4.x/buildconf
> apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
> apr/apr-util/branches/1.4.x/xml/expat/configure.in
>
> Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
> URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=835634&r1=835633&r2=835634&view=diff
> ==============================================================================
> --- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original)
> +++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Thu Nov 12 23:20:20 2009
> @@ -42,12 +47,12 @@
> cat $ltfile >> aclocal.m4
>
> if [ -f ltsugar.m4 ]; then
> - echo "Incorporating ltsugar.m4 into aclocal.m4 ..."
> - cat ltsugar.m4 >> aclocal.m4
> + rm -f conftools/ltsugar.m4
> + mv ltsugar.m4 conftools/ltsugar.m4
> fi
>
> -# Clean up again
> -rm -f libtool.m4 ltsugar.m4
> +# Clean up any leftovers
> +rm -f aclocal.m4 libtool.m4
removing aclocal.m4 is a killer for me with
- Solaris 10
- in-tree expat
- autoconf 2.61
- libtool 1.5.26
- automake 1.11
AC_PROG_LIBTOOL and AC_LIBTOOL_WIN32_DLL aren't found.
Find the discussions around r388605 too ;)