[gnome-utils] [general] Fails to link with pedantic linkers

[Cosimo Cecchi <cosimoc src gnome org>]

commit 4d1a1caa02440a3c64423d1fc6cedbab93e24362
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Mar 30 16:34:51 2010 +0200

    [general] Fails to link with pedantic linkers
    
    Add explicit linking to -lm. Fix bug #609934, patch by Matthias Clasen.

 baobab/src/Makefile.am           |    1 +
 configure.ac                     |    4 ++--
 gnome-dictionary/src/Makefile.am |    2 ++
 gnome-screenshot/Makefile.am     |    1 +
 logview/Makefile.am              |    3 ++-
 5 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index a90c7d7..12343cc 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -47,6 +47,7 @@ baobab_CFLAGS = 			\
 
 baobab_LDFLAGS = -export-dynamic
 baobab_LDADD = 				\
+	-lm				\
 	$(GNOME_UTILS_LIBS)		\
 	$(LIBGTOP_LIBS)			\
 	$(NULL)
diff --git a/configure.ac b/configure.ac
index 74f13cb..df59717 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,9 +123,9 @@ AC_SUBST(GDICT_VERSION)
 
 # xext for gnome-screenshot; in theory checking for xext should be
 # enough but there are a lot of broken distros out there
-PKG_CHECK_MODULES(XSHAPE, xext,
+PKG_CHECK_MODULES(XSHAPE, xext x11,
                   [],
-                  [AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext")])
+                  [AC_CHECK_HEADERS(X11/extensions/shape.h, XSHAPE_LIBS="-lXext -lX11")])
 AC_SUBST(XSHAPE_LIBS)
 
 # gio-unix is needed for gsearchtool
diff --git a/gnome-dictionary/src/Makefile.am b/gnome-dictionary/src/Makefile.am
index 50f4e23..94532b5 100644
--- a/gnome-dictionary/src/Makefile.am
+++ b/gnome-dictionary/src/Makefile.am
@@ -41,6 +41,7 @@ gnome_dictionary_CFLAGS = \
 	$(GNOME_UTILS_CFLAGS) \
 	$(NULL)
 gnome_dictionary_LDADD = \
+	-lm			\
 	$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
 	$(GNOME_UTILS_LIBS) \
 	$(NULL)
@@ -72,6 +73,7 @@ gnome_dictionary_applet_CFLAGS = \
 	$(APPLET_CFLAGS) \
 	$(NULL)
 gnome_dictionary_applet_LDADD = \
+	-lm			\
 	$(top_builddir)/gnome-dictionary/libgdict/libgdict-1.0.la \
 	$(GNOME_UTILS_LIBS) \
 	$(APPLET_LIBS) \
diff --git a/gnome-screenshot/Makefile.am b/gnome-screenshot/Makefile.am
index f9c671d..87368bc 100644
--- a/gnome-screenshot/Makefile.am
+++ b/gnome-screenshot/Makefile.am
@@ -35,6 +35,7 @@ gnome_screenshot_LDADD =		\
 	$(GNOME_UTILS_LIBS)		\
 	$(LIBCANBERRA_GTK_LIBS)		\
 	$(GTHREAD_LIBS)			\
+	-lm				\
 	$(NULL)
 
 gnome_screenshotdir  = $(datadir)/applications
diff --git a/logview/Makefile.am b/logview/Makefile.am
index eb2d915..b1474f5 100644
--- a/logview/Makefile.am
+++ b/logview/Makefile.am
@@ -45,7 +45,8 @@ gnome_system_log_SOURCES = 	\
 gnome_system_log_LDADD =	\
 	$(GNOME_UTILS_LIBS)	\
 	$(GTHREAD_LIBS)		\
-	$(Z_LIBS)
+	$(Z_LIBS)		\
+	-lm
 
 logview-marshal.h: logview-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --header --prefix=logview_marshal >> $@