Re: svn commit: rev 1128 - trunk trunk/ac-helpers

Philip Martin <philip@codematters.co.uk> writes:

> jerenkrantz@tigris.org writes:
>
> > Author: jerenkrantz
> > Date: 2002-02-01 03:21 GMT
> > New Revision: 1128
> >
> > Added:
> > trunk/ac-helpers/find_apr.m4
> > Modified:
> > trunk/ac-helpers/apr.m4
> > trunk/configure.in
> > Log:
> > Use APR's own find_apr.m4 to find APR.
> >
> > (This is essentially the same as revision 703, but with a fix to
> > allow source APR dirs to build.)
> >
> > * ac-helpers/find_apr.m4: New file, imported from APR CVS repository,
> > provides the APR_FIND_APR macro.
> >
> > * ac-helpers/apr.m4 (SVN_LIB_APR): Refactor the APR detection code
> > to take advantage of APR_FIND_APR.
> > (SVN_FIND_APR): Removed.
> >
> > * configure.in: Add find_apr.m4 as an included file to source.
> >
>
> This change appears to have broken builddir != srcdir builds.

I'm not an autoconf expert but this seems to fix it. Anyone object to
the following patch?

Index: ./ac-helpers/aprutil.m4
===================================================================
--- ./ac-helpers/aprutil.m4
+++ ./ac-helpers/aprutil.m4 Fri Feb 1 13:58:37 2002
@@ -17,6 +17,10 @@
   APR_FIND_APU(apr-util, $abs_builddir)
 
   if test $apu_found = "no"; then
+ APR_FIND_APU($srcdir/apr-util, $abs_builddir)
+ fi
+
+ if test $apu_found = "no"; then
     AC_MSG_WARN([APRUTIL not found])
     SVN_DOWNLOAD_APRUTIL
   fi
Index: ./ac-helpers/apr.m4
===================================================================
--- ./ac-helpers/apr.m4
+++ ./ac-helpers/apr.m4 Fri Feb 1 13:56:50 2002
@@ -12,6 +12,10 @@
   APR_FIND_APR(apr, $abs_builddir)
 
   if test $apr_found = "no"; then
+ APR_FIND_APR($srcdir/apr, $abs_builddir)
+ fi
+
+ if test $apr_found = "no"; then
     AC_MSG_WARN([APR not found])
     SVN_DOWNLOAD_APR
   fi

-- 
Philip
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org