isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-09 23:46:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Use LT_LIB_M to find the math library in a portable way

Browse Source 
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
This commit is contained in:
Emanuele Aina 2013-04-05 11:04:08 +00:00 committed by Neil Roberts
parent 08b0d2d63e
commit b8673fbb2f
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -41,6 +41,7 @@ config.h
config.h.in config.h.in
config.h.win32 config.h.win32
config.log config.log
config.lt
config.status config.status
configure configure
depcomp depcomp

2
cogl/Makefile.am
View File

@ -554,7 +554,7 @@ include $(top_srcdir)/build/autotools/Makefile.am.enums
lib_LTLIBRARIES += libcogl.la 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 if !USE_GLIB
libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la libcogl_la_LIBADD += $(top_builddir)/deps/glib/libglib.la
libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la libcogl_la_LIBADD += $(top_builddir)/deps/gmodule/libgmodule.la

6
configure.ac
View File

@ -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) dnl internal glib configure (as-glibconfig.m4)
m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
dnl ================================================================
dnl Find an appropriate libm, for sin() etc.
dnl ================================================================
LT_LIB_M
AC_SUBST(LIBM)
dnl ================================================================ dnl ================================================================
dnl See what platform we are building for dnl See what platform we are building for
dnl ================================================================ dnl ================================================================