You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Jeremy Whitlock <jc...@gmail.com> on 2008/10/02 05:08:01 UTC
[PATCH] Fix build/ac-macros/aprutil.m4 to actually set SVN_APRUTIL_PREFIX
Hi All,
While working on integrating the ctypes-python bindings into the
build infrastructure, I realized that the SVN_APRUTIL_PREFIX output
variable in build/ac-macros/aprutil.m4 was never being set, which lead
to SVN_APRUTIL_PREFIX not being set in the Makefile. This is not the
case with SVN_APR_PREFIX so after a little digging, I see that the
code for retrieving, testing and setting SVN_APRUTIL_PREFIX was
missing from build/ac-macros/aprutil.m4. The patch attached, and
pasted below, fixes this. (While this hasn't been an issue to this
point, at least not one that's been pointed out, for those make
targets/variables that would like to know the path to apr-util, this
becomes an issue.) Please let me know what I can do to get this
approved.
--
Take care,
Jeremy Whitlock
http://www.thoughtspark.org
[[[
* build/ac-macros/aprutil.m4: Fix the script to actually retrieve, test and set
the SVN_APRUTIL_PREFIX output variable.
]]]
Index: build/ac-macros/aprutil.m4
===================================================================
--- build/ac-macros/aprutil.m4 (revision 33392)
+++ build/ac-macros/aprutil.m4 (working copy)
@@ -72,6 +72,11 @@
AC_MSG_ERROR([apu-config --includes failed])
fi
+ SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
+ if test $? -ne 0; then
+ AC_MSG_ERROR([apu-config --prefix failed])
+ fi
+
dnl When APR stores the dependent libs in the .la file, we don't need
dnl --libs.
SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
Re: [PATCH] Fix build/ac-macros/aprutil.m4 to actually set SVN_APRUTIL_PREFIX
Posted by Greg Stein <gs...@gmail.com>.
Oh belay the upstream thing. It's the find-*.m4 files from upstream.
On Thu, Oct 2, 2008 at 2:02 AM, Greg Stein <gs...@gmail.com> wrote:
> +1
>
> I believe this file is a copy of an upstream file, meaning this patch
> should go upstream, too.
>
> (or at least originally, apr.m4 and aprutil.m4 came from upstream;
> hopefully they haven't diverged)
>
> Cheers,
> -g
>
> 2008/10/1 Jeremy Whitlock <jc...@gmail.com>:
>> Hi All,
>> While working on integrating the ctypes-python bindings into the
>> build infrastructure, I realized that the SVN_APRUTIL_PREFIX output
>> variable in build/ac-macros/aprutil.m4 was never being set, which lead
>> to SVN_APRUTIL_PREFIX not being set in the Makefile. This is not the
>> case with SVN_APR_PREFIX so after a little digging, I see that the
>> code for retrieving, testing and setting SVN_APRUTIL_PREFIX was
>> missing from build/ac-macros/aprutil.m4. The patch attached, and
>> pasted below, fixes this. (While this hasn't been an issue to this
>> point, at least not one that's been pointed out, for those make
>> targets/variables that would like to know the path to apr-util, this
>> becomes an issue.) Please let me know what I can do to get this
>> approved.
>>
>> --
>> Take care,
>>
>> Jeremy Whitlock
>> http://www.thoughtspark.org
>>
>> [[[
>> * build/ac-macros/aprutil.m4: Fix the script to actually retrieve, test and set
>> the SVN_APRUTIL_PREFIX output variable.
>> ]]]
>>
>> Index: build/ac-macros/aprutil.m4
>> ===================================================================
>> --- build/ac-macros/aprutil.m4 (revision 33392)
>> +++ build/ac-macros/aprutil.m4 (working copy)
>> @@ -72,6 +72,11 @@
>> AC_MSG_ERROR([apu-config --includes failed])
>> fi
>>
>> + SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
>> + if test $? -ne 0; then
>> + AC_MSG_ERROR([apu-config --prefix failed])
>> + fi
>> +
>> dnl When APR stores the dependent libs in the .la file, we don't need
>> dnl --libs.
>> SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: dev-help@subversion.tigris.org
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix build/ac-macros/aprutil.m4 to actually set SVN_APRUTIL_PREFIX
Posted by Greg Stein <gs...@gmail.com>.
+1
I believe this file is a copy of an upstream file, meaning this patch
should go upstream, too.
(or at least originally, apr.m4 and aprutil.m4 came from upstream;
hopefully they haven't diverged)
Cheers,
-g
2008/10/1 Jeremy Whitlock <jc...@gmail.com>:
> Hi All,
> While working on integrating the ctypes-python bindings into the
> build infrastructure, I realized that the SVN_APRUTIL_PREFIX output
> variable in build/ac-macros/aprutil.m4 was never being set, which lead
> to SVN_APRUTIL_PREFIX not being set in the Makefile. This is not the
> case with SVN_APR_PREFIX so after a little digging, I see that the
> code for retrieving, testing and setting SVN_APRUTIL_PREFIX was
> missing from build/ac-macros/aprutil.m4. The patch attached, and
> pasted below, fixes this. (While this hasn't been an issue to this
> point, at least not one that's been pointed out, for those make
> targets/variables that would like to know the path to apr-util, this
> becomes an issue.) Please let me know what I can do to get this
> approved.
>
> --
> Take care,
>
> Jeremy Whitlock
> http://www.thoughtspark.org
>
> [[[
> * build/ac-macros/aprutil.m4: Fix the script to actually retrieve, test and set
> the SVN_APRUTIL_PREFIX output variable.
> ]]]
>
> Index: build/ac-macros/aprutil.m4
> ===================================================================
> --- build/ac-macros/aprutil.m4 (revision 33392)
> +++ build/ac-macros/aprutil.m4 (working copy)
> @@ -72,6 +72,11 @@
> AC_MSG_ERROR([apu-config --includes failed])
> fi
>
> + SVN_APRUTIL_PREFIX="`$apu_config --prefix`"
> + if test $? -ne 0; then
> + AC_MSG_ERROR([apu-config --prefix failed])
> + fi
> +
> dnl When APR stores the dependent libs in the .la file, we don't need
> dnl --libs.
> SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org