Merge lp:~ken-vandine/ido/link-libm into lp:ido/12.10

Proposed by Ken VanDine
Status: Merged
Merged at revision: 111
Proposed branch: lp:~ken-vandine/ido/link-libm
Merge into: lp:ido/12.10
Diff against target: 25 lines (+3/-1)
2 files modified
configure.ac (+2/-0)
src/Makefile.am (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/ido/link-libm
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+116498@code.launchpad.net

Description of the change

Use AC_CHECK_LIBM to get -lm now that gtk doesn't include that in it's .pc file

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

PASSED: Continuous integration, rev:110
http://jenkins.qa.ubuntu.com/job/ido-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ido-ci/./label=quantal/4/console

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good, but one comment/question, does that $(LIBM) need to be added to libido3.pc.in as well?

Revision history for this message
Ken VanDine (ken-vandine) wrote :

> Looks good, but one comment/question, does that $(LIBM) need to be added to
> libido3.pc.in as well?

I don't think so.

Revision history for this message
Charles Kerr (charlesk) :
review: Approve
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/ido-autolanding/4/

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-04-25 20:24:26 +0000
3+++ configure.ac 2012-07-24 15:31:19 +0000
4@@ -78,6 +78,8 @@
5 AC_FUNC_MMAP
6 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
7
8+AC_CHECK_LIBM
9+
10 AC_ARG_WITH([gtk],
11 [AS_HELP_STRING([--with-gtk],
12 [Which version of gtk to use @<:@default=3@:>@])],
13
14=== modified file 'src/Makefile.am'
15--- src/Makefile.am 2012-04-12 15:18:01 +0000
16+++ src/Makefile.am 2012-07-24 15:31:19 +0000
17@@ -82,7 +82,7 @@
18 idotimeline.h \
19 libido.h
20
21-libido_0_1_la_LIBADD = $(GTK_LIBS)
22+libido_0_1_la_LIBADD = $(GTK_LIBS) $(LIBM)
23 libido_0_1_la_LDFLAGS = \
24 $(GTK_LT_LDFLAGS) \
25 $(COVERAGE_LDFLAGS)

Subscribers

People subscribed via source and target branches