[librsvg] Use LT_LIB_M to find the math library

[Christian Persch <chpe src gnome org>]

commit a5383d989513b3ae1ec7f79539d30831751b6a1a
Author: Christian Persch <chpe gnome org>
Date:   Thu Nov 10 21:50:02 2011 +0100

    Use LT_LIB_M to find the math library

 Makefile.am       |   13 ++++---------
 configure.in      |    5 +++--
 tools/Makefile.am |    6 +++---
 3 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d38a999..5d0f26b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,11 +18,6 @@ if HAVE_GTK_3
 bin_PROGRAMS += rsvg-view-3
 endif
 
-if OS_WIN32
-else
-libm = -lm
-endif
-
 headers = \
 	rsvg.h	\
 	rsvg-cairo.h
@@ -95,7 +90,7 @@ librsvg_ RSVG_API_MAJOR_VERSION@_la_LDFLAGS = -version-info @RSVG_LT_VERSION_INF
 
 librsvg_ RSVG_API_MAJOR_VERSION@_la_LIBADD = \
 	$(LIBRSVG_LIBS) 	\
-	$(libm)
+	$(LIBM)
 
 librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
 librsvginc_HEADERS = 	\
@@ -127,7 +122,7 @@ rsvg_convert_LDADD = \
 	$(top_builddir)/librsvg- RSVG_API_MAJOR_VERSION@.la	\
 	$(LIBRSVG_LIBS)		\
 	$(GTHREAD_LIBS)		\
-	$(libm)
+	$(LIBM)
 
 rsvg_view_SOURCES = \
 	test-display.c
@@ -150,7 +145,7 @@ rsvg_view_LDADD = \
 	$(GTK2_LIBS)		\
 	$(LIBRSVG_LIBS)		\
 	$(GTHREAD_LIBS)		\
-	$(libm)
+	$(LIBM)
 
 rsvg_view_3_SOURCES = \
 	test-display.c
@@ -173,7 +168,7 @@ rsvg_view_3_LDADD = \
 	$(GTK3_LIBS)		\
 	$(LIBRSVG_LIBS)		\
 	$(GTHREAD_LIBS)		\
-	$(libm)
+	$(LIBM)
 
 EXTRA_DIST =				\
 	librsvg.doap			\
diff --git a/configure.in b/configure.in
index 8417e45..f96b3d5 100644
--- a/configure.in
+++ b/configure.in
@@ -54,8 +54,6 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_AWK
-AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
 AC_STDC_HEADERS
 AM_PROG_CC_C_O
 
@@ -63,6 +61,9 @@ AC_C_BIGENDIAN
 
 PKG_PROG_PKG_CONFIG
 
+LT_INIT([win32-dll])
+LT_LIB_M
+
 dnl ===========================================================================
 
 #AC_CANONICAL_HOST
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 72acfd2..8ae7e3a 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -32,14 +32,14 @@ librsvg_tools_main_la_LIBADD =
 test_performance_SOURCES = test-performance.c
 test_performance_LDFLAGS =
 test_performance_DEPENDENCIES = $(DEPS)
-test_performance_LDADD = librsvg_tools_main.la $(LDADDS) $(libm)
+test_performance_LDADD = librsvg_tools_main.la $(LDADDS) $(LIBM)
 
 rsvg_dimensions_SOURCES = rsvg-dimensions.c
 rsvg_dimensions_LDFLAGS =
 rsvg_dimensions_DEPENDENCIES = $(DEPS)
-rsvg_dimensions_LDADD = $(LDADDS) $(libm)
+rsvg_dimensions_LDADD = $(LDADDS) $(LIBM)
 
 test_memory_SOURCES = test-memory.c
 test_memory_LDFLAGS =
 test_memory_DEPENDENCIES = $(DEPS)
-test_memory_LDADD = librsvg_tools_main.la $(LDADDS) $(libm)
+test_memory_LDADD = librsvg_tools_main.la $(LDADDS) $(LIBM)