diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2013-04-05 11:04:08 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2013-04-23 18:30:50 +0100 |
| commit | b8673fbb2fef9762b03092ea35c3f86868b5963b (patch) | |
| tree | bc652d5975c88749384c8801f035a15b73b9f0c3 | |
| parent | 08b0d2d63ed400955b865ad4a205d2fff74e6cc6 (diff) | |
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
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cogl/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 8 insertions, 1 deletions
@@ -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 5dee0988..80d3b09a 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 3e9742b4..a2543487 100644 --- a/configure.ac +++ b/configure.ac @@ -178,6 +178,12 @@ 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 ================================================================ AC_CANONICAL_HOST |