revision 1290 breaks when builddir != srcdir

Revision 1290 included this change to ac-helpers/aprutil.m4

- APR_FIND_APU(apr-util, $abs_builddir)
-
- if test $apu_found = "no" \
- && test "$abs_srcdir" != "$abs_builddir" \
- && test -d "$abs_srcdir/apr-util"; then
- dnl HACKS to get builddir != srcdir to work, should APR_FIND_APU do this?
- echo "using apr-util in Subversion source dir"
- apu_found="reconfig"
- apu_config=$abs_builddir/apr-util/apu-config
- apu_srcdir=apr-util
- dnl HACK to get apr-util to configure bundled xml/expat
- test -d $abs_builddir/apr-util/xml/expat \
- || $MKDIR $abs_builddir/apr-util/xml/expat
- fi
+ APR_FIND_APU("$srcdir/apr-util", "./apr-util")

This breaks a build from scratch with builddir != srcdir. The reason
is that if the directory <builddir>/apr-util/xml/expat does not exist
when apr-util dirctory is configured, then expat.h does not get
created. Is there any reason I should not put this bit back?

Index: ac-helpers/aprutil.m4
===================================================================
--- ac-helpers/aprutil.m4
+++ ac-helpers/aprutil.m4 Fri Feb 22 20:57:25 2002
@@ -22,6 +22,12 @@
   fi
 
   if test $apu_found = "reconfig"; then
+ if test "$abs_srcdir" != "$abs_builddir" \
+ && test -d "$abs_srcdir/apr-util"; then
+ dnl must have expat directory before configuring apr-util
+ test -d $abs_builddir/apr-util/xml/expat \
+ || $MKDIR $abs_builddir/apr-util/xml/expat
+ fi
     SVN_SUBDIR_CONFIG(apr-util, --with-apr=../apr)
     SVN_SUBDIRS="$SVN_SUBDIRS apr-util"
   fi

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