Merge lp:~lool/timezonemap/link-with-libm into lp:timezonemap

[Loïc Minier]

Hi,

This fixes a FTBFS seen on armhf https://launchpadlibrarian.net/86196928/buildlog_ubuntu-precise-armhf.libtimezonemap_0.2_FAILEDTOBUILD.txt.gzbut present on all arches:
libtool: link: gcc -shared -fPIC -DPIC .libs/cc-timezone-map.o .libs/tz.o -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 /usr/lib/arm-linux-gnueabihf/libcairo-gobject.so /usr/lib/arm-linux-gnueabihf/libcairo.so -lpango-1.0 /usr/lib/arm-linux-gnueabihf/libfreetype.so -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -O2 -O2 -Wl,-Bsymbolic-functions -Wl,-z -Wl,relro -Wl,-z -Wl,defs -Wl,--as-needed -pthread -pthread -Wl,-soname -Wl,libtimezonemap.so.1 -Wl,-version-script -Wl,.libs/libtimezonemap.ver -o .libs/libtimezonemap.so.1.0.0
.libs/cc-timezone-map.o: In function `convert_latitude_to_y':
/build/buildd/libtimezonemap-0.2/./src/cc-timezone-map.c:724: undefined reference to `tan'
/build/buildd/libtimezonemap-0.2/./src/cc-timezone-map.c:724: undefined reference to `log'
.libs/tz.o: In function `convert_pos':
/build/buildd/libtimezonemap-0.2/./src/tz.c:519: undefined reference to `pow'
/build/buildd/libtimezonemap-0.2/./src/tz.c:518: undefined reference to `pow'
collect2: ld returned 1 exit status

this is due to recent changes in gtk+ which stopped pulling -lm via pkg-config.

Cheers,

[Loïc Minier (lool)]

I see -lm was added in src/Makefile.am in r16:
http://bazaar.launchpad.net/~timezonemap-team/timezonemap/trunk/revision/16

using AC_CHECK_LIBM seems a bit nicer though; you could use $LIBM in src/Makefile.am instead of -lm

=== modified file 'configure.ac'
--- configure.ac	2011-07-29 08:36:49 +0000
+++ configure.ac	2011-12-01 16:06:35 +0000
@@ -51,8 +51,11 @@
 GTK3_REQUIRED_VERSION=3.1.4
 GIO_REQUIRED_VERSION=2.5.11
 
+AC_CHECK_LIBM
+
 PKG_CHECK_MODULES(LIBTIMEZONEMAP, gio-2.0 >= $GIO_REQUIRED_VERSION
                                   gtk+-3.0 >= $GTK3_REQUIRED_VERSION)
+LIBTIMEZONEMAP_LIBS="$LIBTIMEZONEMAP_LIBS $LIBM"
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])