Enure that libFLAC is linked with -lm on all architectures, and regardless of

whether nasm is present

diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index aef7630..920ddf2 100644 (file)
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -39,9 +39,7 @@ else
 if FLaC__CPU_IA32
 if FLaC__HAS_NASM
 ARCH_SUBDIRS = ia32
-libFLAC_la_LIBADD = -lm ia32/libFLAC-asm.la
-else
-libFLAC_la_LIBADD = -lm
+libFLAC_la_LIBADD = ia32/libFLAC-asm.la
 endif
 endif
 endif
@@ -58,7 +56,7 @@ EXTRA_DIST = \
        libFLAC.m4
 
 # see 'http://www.gnu.org/software/libtool/manual.html#Versioning' for numbering convention
-libFLAC_la_LDFLAGS = -version-info 5:2:1
+libFLAC_la_LDFLAGS = -version-info 5:2:1 -lm
 libFLAC_la_SOURCES = \
        bitbuffer.c \
        bitmath.c \