[cairo] [cairo-commit] 2 commits - configure.ac

[Behdad Esfahbod]

And revert that commit please.  Or bother explaining what it's trying to fix.


On 09/15/10 17:52, Behdad Esfahbod wrote:
> As if your response helps...
> 
> If I understand the issue correctly, you are saying that the output of
> 'pkg-config --* gobject' has changed.  Well, the configure cache does not
> handle that case *by design*.
> 
> Just don't use a cache, or delete it and reconfigure!  This has nothing to do
> with the special build system and m4 macros.  This is autotools 101.  If you
> can't be bothered to learn that much, just remove the --cache-file line from
> autogen.sh so it's not enabled by default on any build.
> 
> behdad
> 
> On 09/15/10 17:07, Benjamin Otte wrote:
>> It turned out we had an unmaintained build system. So I made stuff work.
>>
>> Feel free to find someone who wants to spend time maintaining this huge
>> mess of m4 macros. All the people I know who might be capable are
>> trolling on the Cairo mailing list.
>>
>> Benjamin
>>
>>
>> On Wed, 2010-09-15 at 14:47 -0400, Behdad Esfahbod wrote:
>>> On 09/01/10 12:48, Benjamin Otte wrote:
>>>> commit 54a651564cdd2510d0a66f6720c4a45733ff3285
>>>> Author: Benjamin Otte <otte at redhat.com>
>>>> Date:   Wed Sep 1 18:47:16 2010 +0200
>>>>
>>>>     build: Work around caching not reevaluating uncached variables
>>>>
>>>>     This is a somewhat crude hack to ensure that GOBJECT_CFLAGS/LIBS are
>>>>     properly cached.
>>>
>>> What's this???
>>>
>>>
>>>> diff --git a/configure.ac b/configure.ac
>>>> index a8b0f9b..47d2b99 100644
>>>> --- a/configure.ac
>>>> +++ b/configure.ac
>>>> @@ -660,6 +660,10 @@ CAIRO_ENABLE_FUNCTIONS(gobject, gobject, auto, [
>>>>    use_gobject="no (requires $gobject_REQUIRES http://download.gnome.org/pub/GNOME/sources/glib/)"])
>>>>    gobject_NONPKGCONFIG_EXTRA_LIBS="-L\${libdir} -lcairo-gobject"
>>>>  ])
>>>> +dnl I'm too lazy to fix the caching properly
>>>
>>> Then don't commit!
>>>
>>> behdad
>>>
>>>
>>>> +if test "x$use_gobject" = "xyes"; then
>>>> +  PKG_CHECK_MODULES(GOBJECT, $gobject_REQUIRES)
>>>> +fi
>>>>  
>>>>  dnl ===========================================================================
>>>>  dnl Default to quick testing during development, but force a full test before
>>> --
>>> cairo mailing list
>>> cairo at cairographics.org
>>> http://lists.cairographics.org/mailman/listinfo/cairo
>>
>>
>>