On Sat, Feb 02, 2002 at 12:28:28PM -0600, philip@tigris.org wrote:
> Author: philip
> Date: 2002-02-02 18:28 GMT
> New Revision: 1146
>
> Modified:
> trunk/ac-helpers/apr.m4
> trunk/ac-helpers/aprutil.m4
> Log:
> When building apr and apr-util with builddir != srcdir make sure they
> build in the builddir. Revert revision 1134, which also tried to do
> this, as it doesn't work.
>
> * ac-helpers/apr.m4: Fix up some of the APR_FIND_APR values. Add
> <builddir>/apr/include to SVN_EXTRA_INCLUDES.
>
> * ac-helpers/aprutil.m4: Fix up some of the APR_FIND_APU values. Force
> creation of <builddir>/apr-util/xml/expat/ before configuring apr-util.
I'm thinking that getting the provided m4 macros to recognize
srcdir != builddir might get complicated. Doable, but perhaps
that logic is best done in the application itself.
The issue about the xml/expat directory needing to be created is
intentional, for whatever it's worth. We *could* fix apr-util
to create that directory in its configure process if it is not
there.
Greg? -- justin
> Modified: trunk/ac-helpers/aprutil.m4
> ==============================================================================
> --- OLD/trunk/ac-helpers/aprutil.m4 Sat Feb 2 12:28:24 2002
> +++ NEW/trunk/ac-helpers/aprutil.m4 Sat Feb 2 12:28:24 2002
> @@ -14,7 +14,20 @@
> [
> AC_MSG_NOTICE([Apache Portable Runtime Utility (APRUTIL) library configuration])
>
> - APR_FIND_APU($srcdir/apr-util, $abs_builddir)
> + 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
>
> if test $apu_found = "no"; then
> AC_MSG_WARN([APRUTIL not found])
>
> Modified: trunk/ac-helpers/apr.m4
> ==============================================================================
> --- OLD/trunk/ac-helpers/apr.m4 Sat Feb 2 12:28:24 2002
> +++ NEW/trunk/ac-helpers/apr.m4 Sat Feb 2 12:28:24 2002
> @@ -9,7 +9,18 @@
>
> AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration])
>
> - APR_FIND_APR($srcdir/apr, $abs_builddir)
> + APR_FIND_APR(apr, $abs_builddir)
> +
> + if test $apr_found = "no" \
> + && test "$abs_srcdir" != "$abs_builddir" \
> + && test -d "$abs_srcdir/apr"; then
> + dnl HACKS to get builddir != srcdir to work, should APR_FIND_APR do this?
> + echo "using apr in Subversion source dir"
> + apr_found="reconfig"
> + apr_config=$abs_builddir/apr/apr-config
> + apr_la_file=$abs_builddir/apr/libapr.la
> + apr_srcdir=apr
> + fi
>
> if test $apr_found = "no"; then
> AC_MSG_WARN([APR not found])
> @@ -34,7 +45,7 @@
>
> SVN_EXTRA_INCLUDES="$SVN_EXTRA_INCLUDES $apr_includes"
> if test "$abs_srcdir" != "$abs_builddir" && test -d "$abs_srcdir/apr" ; then
> - SVN_EXTRA_INCLUDES="$SVN_EXTRA_INCLUDES -I$abs_srcdir/apr/include"
> + SVN_EXTRA_INCLUDES="$SVN_EXTRA_INCLUDES -I$abs_srcdir/apr/include -I$abs_builddir/apr/include"
> fi
>
> if test -z "$apr_la_file" ; then
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:03 2006