pixman: Branch 'master'

[Søren Sandmann Pedersen]

 test/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45a2d010773d05666e87b7a6502e8fcb25add4eb
Author: Cyril Brulebois <kibi at debian.org>
Date:   Sun Dec 19 19:37:26 2010 +0100

    Fix linking issues when HAVE_FEENABLEEXCEPT is set.
    
    All objects using test/util.c fail to link:
    |   CCLD   region-test
    | /usr/bin/ld: utils.o: in function enable_fp_exceptions:utils.c(.text+0x939): error: undefined reference to 'feenableexcept'
    
    There's indeed no explicit dependency on -lm, and if HAVE_FEENABLEEXCEPT
    happens to be set, test/util.c uses feenableexcept(), which is nowhere
    to be found while linking.
    
    Fix this by adding -lm to TEST_LDADD, although two alternatives could be
    thought of:
     - Only specifying -lm for objects using util.c.
     - Introducing a conditional to add -lm only when configure detects
       have_feenableexcept=yes.
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>

diff --git a/test/Makefile.am b/test/Makefile.am
index 52e4183..bc92e65 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
 AM_CFLAGS = @OPENMP_CFLAGS@
 AM_LDFLAGS = @OPENMP_CFLAGS@
 
-TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la
+TEST_LDADD = $(top_builddir)/pixman/libpixman-1.la -lm
 INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman
 
 TESTPROGRAMS =			\