From f92286b3dab0b59c984eb12ce32e7f40da3d671a Mon Sep 17 00:00:00 2001 From: Ron <ron@debian.org> Date: Tue, 2 Jul 2013 02:35:53 +0930 Subject: [PATCH] Get rid of PC_LIBM It only existed to not include -lm in the .pc for fixed point builds, but that is still needed since the float API is still enabled and will use at least lrint. --- configure.ac | 3 --- opus-uninstalled.pc.in | 2 +- opus.pc.in | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 13d04b094..3881cb4d5 100644 --- a/configure.ac +++ b/configure.ac @@ -125,7 +125,6 @@ AS_IF([test "$enable_fixed_point" = "yes"],[ ],[ enable_float="yes"; PC_BUILD="floating-point" - PC_LIBM="$LIBM" ]) AM_CONDITIONAL([FIXED_POINT], [test "$enable_fixed_point" = "yes"]) @@ -145,7 +144,6 @@ AC_ARG_ENABLE([custom-modes], AS_IF([test "$enable_custom_modes" = "yes"],[ AC_DEFINE([CUSTOM_MODES], [1], [Custom modes]) PC_BUILD="$PC_BUILD, custom modes" - PC_LIBM="$LIBM" ]) AM_CONDITIONAL([CUSTOM_MODES], [test "$enable_custom_modes" = "yes"]) @@ -289,7 +287,6 @@ LIBS="$saved_LIBS" AC_CHECK_FUNCS([__malloc_hook]) AC_SUBST([PC_BUILD]) -AC_SUBST([PC_LIBM]) AC_CONFIG_FILES([Makefile opus.pc opus-uninstalled.pc diff --git a/opus-uninstalled.pc.in b/opus-uninstalled.pc.in index 36e8db6a9..3f2d6744d 100644 --- a/opus-uninstalled.pc.in +++ b/opus-uninstalled.pc.in @@ -8,5 +8,5 @@ Description: Opus IETF audio codec (not installed, @PC_BUILD@) Version: @VERSION@ Requires: Conflicts: -Libs: ${libdir}/libopus.a @PC_LIBM@ +Libs: ${libdir}/libopus.a @LIBM@ Cflags: -I${pcfiledir}/@top_srcdir@/include diff --git a/opus.pc.in b/opus.pc.in index b7d40838c..e15c6fed2 100644 --- a/opus.pc.in +++ b/opus.pc.in @@ -12,5 +12,5 @@ Version: @VERSION@ Requires: Conflicts: Libs: -L${libdir} -lopus -Libs.private: @PC_LIBM@ +Libs.private: @LIBM@ Cflags: -I${includedir}/opus -- GitLab