From b8673fbb2fef9762b03092ea35c3f86868b5963b Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Fri, 5 Apr 2013 11:04:08 +0000
Subject: [PATCH] build: Use LT_LIB_M to find the math library in a portable
 way

https://bugzilla.gnome.org/show_bug.cgi?id=697330

Reviewed-by: Robert Bragg <robert@linux.intel.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>

(cherry picked from commit a7b4930e14add7d955c22f396178b71083dfb52f)

Conflicts:
	cogl/Makefile.am
---
 .gitignore       | 1 +
 cogl/Makefile.am | 2 +-
 configure.ac     | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1adb397a6..daf3db7fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ config.h
 config.h.in
 config.h.win32
 config.log
+config.lt
 config.status
 configure
 depcomp
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 5dee0988d..80d3b09af 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -554,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums
 
 lib_LTLIBRARIES += libcogl.la
 
-libcogl_la_LIBADD = -lm $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
+libcogl_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
 if !USE_GLIB
 libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la
 libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la
diff --git a/configure.ac b/configure.ac
index 3e9742b48..a25434878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,12 @@ dnl when using libtool 2.x create libtool early, because it's used in the
 dnl internal glib configure (as-glibconfig.m4)
 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 
+dnl ================================================================
+dnl Find an appropriate libm, for sin() etc.
+dnl ================================================================
+LT_LIB_M
+AC_SUBST(LIBM)
+
 dnl ================================================================
 dnl See what platform we are building for
 dnl ================================================================