diff options
| author | Ron <ron@debian.org> | 2013-12-07 20:35:39 +0400 |
|---|---|---|
| committer | Ron <ron@debian.org> | 2013-12-07 20:35:39 +0400 |
| commit | 6ae7f8616bffd92a2059ac456a59801d46a11dad (patch) | |
| tree | 5f0749b801d0f6548bd488bb8a0fcf94c68c02a6 | |
| parent | ef80120166c3a2552f77008f40c59a84577a36b5 (diff) | |
Don't overlink with libm
This will also work on systems where libm is not required.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libspeex/Makefile.am | 7 | ||||
| -rw-r--r-- | speex.pc.in | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0626347..07ebff2 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,7 @@ AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h) XIPH_PATH_OGG([src="src"], [src=""]) AC_SUBST(src) -AC_CHECK_LIB(m, sin) +LT_LIB_M # Check for getopt_long; if not found, use included source. AC_CHECK_FUNCS([getopt_long],, diff --git a/libspeex/Makefile.am b/libspeex/Makefile.am index 0052814..1181138 100644 --- a/libspeex/Makefile.am +++ b/libspeex/Makefile.am @@ -40,11 +40,12 @@ noinst_HEADERS = arch.h bfin.h cb_search_arm4.h cb_search_bfin.h cb_search_s libspeex_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@ +libspeex_la_LIBADD = $(LIBM) noinst_PROGRAMS = testenc testenc_wb testenc_uwb testenc_SOURCES = testenc.c -testenc_LDADD = libspeex.la +testenc_LDADD = libspeex.la $(LIBM) testenc_wb_SOURCES = testenc_wb.c -testenc_wb_LDADD = libspeex.la +testenc_wb_LDADD = libspeex.la $(LIBM) testenc_uwb_SOURCES = testenc_uwb.c -testenc_uwb_LDADD = libspeex.la +testenc_uwb_LDADD = libspeex.la $(LIBM) diff --git a/speex.pc.in b/speex.pc.in index 3e72a36..97bba4f 100644 --- a/speex.pc.in +++ b/speex.pc.in @@ -11,5 +11,5 @@ Version: @SPEEX_VERSION@ Requires: Conflicts: Libs: -L${libdir} -lspeex -Libs.private: -lm +Libs.private: @LIBM@ Cflags: -I${includedir} |