Re: builddir != srcdir is broken

Thank you indeed. I hadn't realized I had broken vpath builds quite so badly.

I'll try to get this in tomorrow morning. The wife will kill me if I spend
any more time on the computer right now...

On Fri, Oct 26, 2001 at 01:29:06AM +0100, Philip Martin wrote:
>
> [I am confused, only one of six mails I have sent today has appeared
> on the list.]
>
> Kevin Pilch-Bisson <kevin@pilch-bisson.net> writes:
>
> > Done now. It should work again.
> >
> > On Thu, Oct 25, 2001 at 11:41:20PM +0100, Philip Martin wrote:
> > >
> > > [Sorry if this is a duplicate, the first copy I sent doesn't appear to
> > > have made it. -pm]
> > >
> > > I have the directory structure
> > > .../svn/
> > > .../svn/apr/
> > > .../svn/db/
> > > .../svn/neon/
> > > .../obj/
> > > and I build in the obj directory. This used to work, but now doesn't:
>
>
> Yes, I started with this, but it was not enough for me to build. An
> earlier mail I sent (that vanished) included this:
>
>
>
> Well I'm no autoconf hacker, but... this works with my setup building
> both in and out of the source tree, I haven't tested it for cases when
> apr/neon are outside the tree.
>
>
> * ac-helpers/apr.m4: Support builddir != srcdir with apr/ in source tree.
> ac-helpers/neon.m4: Support builddir != srcdir with neon/ in source
> tree.
> configure.in: Put INSTALL and MKDIR earlier so that they are defined
> before being used.
>
>
> Index: ./ac-helpers/apr.m4
> ===================================================================
> --- ./ac-helpers/.svn/text-base/apr.m4 Thu Oct 25 19:49:55 2001
> +++ ./ac-helpers/apr.m4 Thu Oct 25 23:59:05 2001
> @@ -66,11 +66,11 @@
>
> if test -d $abs_srcdir/apr ; then
> echo "Using apr found in source directory"
> - APR_INCLUDES='$(abs_srcdir)/apr/include'
> - APR_LIBS='$(abs_srcdir)/apr'
> + APR_INCLUDES='$(abs_builddir)/apr/include'
> + APR_LIBS='$(abs_builddir)/apr'
> APRVARS=$abs_builddir/apr/APRVARS
> echo "Creating config files for APR..."
> - (cd apr; ./buildconf) # this is apr's equivalent of autogen.sh
> + (cd $abs_srcdir/apr; ./buildconf) # this is apr's equivalent of autogen.sh
> SVN_SUBDIR_CONFIG(apr)
> APR_SUBDIR=apr
> else
> @@ -94,8 +94,8 @@
> dnl APR
> if test -n "$APR_INCLUDES" ; then
> SVN_APR_INCLUDES="-I$APR_INCLUDES"
> - if test "$abs_srcdir" != "$abs_builddir" ; then
> - SVN_APR_INCLUDES="-I$APR_INCLUDES $SVN_APR_INCLUDES"
> + if test "$abs_srcdir" != "$abs_builddir" && test -d $abs_srcdir/apr ; then
> + SVN_APR_INCLUDES="-I$abs_srcdir/apr/include $SVN_APR_INCLUDES"
> fi
> fi
> AC_SUBST(SVN_APR_INCLUDES)
> Index: ./ac-helpers/neon.m4
> ===================================================================
> --- ./ac-helpers/.svn/text-base/neon.m4 Thu Oct 25 19:49:56 2001
> +++ ./ac-helpers/neon.m4 Thu Oct 25 21:13:38 2001
> @@ -40,7 +40,7 @@
> [
> AC_MSG_CHECKING([neon library version])
> if test -d $abs_srcdir/neon ; then
> - NEON_VERSION=`ac-helpers/get-neon-ver.sh neon`
> + NEON_VERSION=`$abs_srcdir/ac-helpers/get-neon-ver.sh $abs_srcdir/neon`
> AC_MSG_RESULT([$NEON_VERSION])
> if test "$NEON_WANTED" != "$NEON_VERSION"; then
> echo "You have a neon/ subdir containing version $NEON_VERSION,"
> Index: ./configure.in
> ===================================================================
> --- ./.svn/text-base/configure.in Thu Oct 25 19:49:25 2001
> +++ ./configure.in Thu Oct 25 22:04:33 2001
> @@ -15,6 +15,16 @@
> abs_srcdir="`cd $srcdir && pwd`"
> abs_builddir="`pwd`"
>
> +dnl ### should we ever bother with the system install?
> +dnl use abs_srcdir. sometimes during installation, libtool will relink the
> +dnl library. when it does this, it does a "cd", so a relative use of
> +dnl install-sh will not work.
> +INSTALL="$abs_srcdir/ac-helpers/install-sh -c"
> +AC_SUBST(INSTALL)
> +
> +MKDIR="$INSTALL -d"
> +AC_SUBST(MKDIR)
> +
> dnl Grab our own macros
> sinclude(ac-helpers/berkeley-db.m4)
> sinclude(ac-helpers/svn-apache.m4)
> @@ -86,16 +96,6 @@
>
> dnl find Apache
> SVN_FIND_APACHE
> -
> -dnl ### should we ever bother with the system install?
> -dnl use abs_srcdir. sometimes during installation, libtool will relink the
> -dnl library. when it does this, it does a "cd", so a relative use of
> -dnl install-sh will not work.
> -INSTALL="\$(abs_srcdir)/ac-helpers/install-sh -c"
> -AC_SUBST(INSTALL)
> -
> -MKDIR="$INSTALL -d"
> -AC_SUBST(MKDIR)
>
> dnl Check for libraries --------------------
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

-- 
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Kevin Pilch-Bisson                    http://www.pilch-bisson.net
     "Historically speaking, the presences of wheels in Unix
     has never precluded their reinvention." - Larry Wall
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~