Bug 690891 – Support Automake 1.13

After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.

Bug 690891 - Support Automake 1.13


Summary:	Support Automake 1.13


Status:	RESOLVED FIXED

Product:	cogl
Classification:	Platform
Component:	general
Version:	git master
Hardware:	Other Linux

Importance:	Normal normal
Target Milestone:	---
Assigned To:	Cogl maintainer(s)
QA Contact:	Cogl maintainer(s)

URL:
Whiteboard:

Depends on:
Blocks:

Reported:	2012-12-30 16:32 UTC by Kerrick Staley
Modified:	2013-02-04 13:30 UTC

See Also:
GNOME target:	---
GNOME version:	---

Attachments
Patch to allow Automake 1.13 (460 bytes, patch) 2012-12-30 16:32 UTC, Kerrick Staley	none	Details \| Review

Description Kerrick Staley 2012-12-30 16:32:33 UTC

Created attachment 232392 [details] [review]
Patch to allow Automake 1.13

Cogl fails to build with Automake 1.13 because autogen.sh checks to ensure the Automake version is 1.11 or 1.12. Nothing breaks when building with 1.13, however, so autogen.sh should allow version 1.13. Simple patch attached.

Comment 1 Robert Bragg 2013-01-22 18:48:48 UTC

Thanks for reporting this and attaching a patch.

I've pushed the following commit to master based on your suggestion and cherry picked this to the cogl-1.14 branch too:

commit 5de5569e960102afe979a5f2f0403e1defebca62
Author: Robert Bragg <robert@linux.intel.com>
Date:   Thu Jan 17 22:56:41 2013 +0000

    build: update to build with automake 1.13
    
    This make autogen.sh look for automake-1.13 and also updates all
    Makefile.am files to no longer use the INCLUDES variable which automake
    1.13 warns is deprecated by AM_CPPFLAGS.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=690891
    
    Reviewed-by: Neil Roberts <neil@linux.intel.com>

Comment 2 Kerrick Staley 2013-02-01 10:16:00 UTC

Could you perhaps cherry-pick it to cogl-1.12, too? That's the branch that JHBuild builds with the gnome-apps-3.8 moduleset.

Comment 3 Robert Bragg 2013-02-04 13:30:57 UTC

Since last Sunday the JHBuild modulesets for gnome 3.8 should now be picking the cogl-1.14 branch so hopefully that effectively resolves your issue. If you still need it cherry picked to 1.12 then please re-open, thanks.