Can someone try this patch on such a system? I don't have access to one but the patch looks OK on a brief inspection.
david ----- Original Message ----- From: "Joe Orton" <[EMAIL PROTECTED]> To: <[email protected]> Sent: Wednesday, May 08, 2002 10:30 AM Subject: [PATCH] support $AUTOCONF and $AUTOHEADER > This is useful for when autoconf 2.13 and 2.5x are both in $PATH, but > 2.5x is configured using --progam-suffix=-2.53, a la Red Hat Linux 7.3. > And clean up the 'autom4te-2.53.cache' directory produced by that > configuration. > > Two patches below: one for apr, one for apr-util (expat portion > submitted upstream too). > > Index: buildconf > =================================================================== > RCS file: /home/cvspublic/apr/buildconf,v > retrieving revision 1.23 > diff -u -r1.23 buildconf > --- buildconf 13 Mar 2002 20:39:08 -0000 1.23 > +++ buildconf 8 May 2002 09:14:56 -0000 > @@ -98,13 +98,13 @@ > # Generate the autoconf header and ./configure > # > echo "Creating include/arch/unix/apr_private.h.in ..." > -autoheader > +${AUTOHEADER:-autoheader} > > echo "Creating configure ..." > ### do some work to toss config.cache? > -autoconf > +${AUTOCONF:-autoconf} > > # Remove autoconf 2.5x's cache directory > -rm -rf autom4te.cache > +rm -rf autom4te*.cache > > exit 0 > Index: build/buildcheck.sh > =================================================================== > RCS file: /home/cvspublic/apr/build/buildcheck.sh,v > retrieving revision 1.5 > diff -u -r1.5 buildcheck.sh > --- build/buildcheck.sh 12 Jul 2001 07:52:25 -0000 1.5 > +++ build/buildcheck.sh 8 May 2002 09:14:56 -0000 > @@ -3,7 +3,7 @@ > echo "buildconf: checking installation..." > > # autoconf 2.13 or newer > -ac_version=`autoconf --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` > +ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` > if test -z "$ac_version"; then > echo "buildconf: autoconf not found." > echo " You need autoconf version 2.13 or newer installed" > > > > And for apr-util: > > Index: buildconf > =================================================================== > RCS file: /home/cvspublic/apr-util/buildconf,v > retrieving revision 1.5 > diff -u -r1.5 buildconf > --- buildconf 3 Feb 2002 15:19:20 -0000 1.5 > +++ buildconf 8 May 2002 09:15:27 -0000 > @@ -1,17 +1,17 @@ > #!/bin/sh > > # Remove aclocal.m4 as it'll break some builds... > -rm -rf aclocal.m4 autom4te.cache > +rm -rf aclocal.m4 autom4te*.cache > > # > # Generate the autoconf header (include/apu_config.h) and ./configure > # > echo "Creating include/private/apu_config.h ..." > -autoheader > +${AUTOHEADER:-autoheader} > > echo "Creating configure ..." > ### do some work to toss config.cache? > -if autoconf; then > +if ${AUTOCONF:-autoconf}; then > : > else > echo "autoconf failed" > Index: xml/expat/buildconf.sh > =================================================================== > RCS file: /home/cvspublic/apr-util/xml/expat/buildconf.sh,v > retrieving revision 1.9 > diff -u -r1.9 buildconf.sh > --- xml/expat/buildconf.sh 27 Apr 2002 05:57:23 -0000 1.9 > +++ xml/expat/buildconf.sh 8 May 2002 09:15:27 -0000 > @@ -37,10 +37,10 @@ > # Generate the autoconf header template (config.h.in) and ./configure > # > echo "Creating config.h.in ..." > -autoheader 2>&1 | grep -v "$cross_compile_warning" > +${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning" > > echo "Creating configure ..." > ### do some work to toss config.cache? > -autoconf 2>&1 | grep -v "$cross_compile_warning" > +${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning" > > exit 0 > > >
