From 48b001d3d07993416f142bd98118225fa284a758 Mon Sep 17 00:00:00 2001 From: "benjamin.drung@gmail.com" Date: Tue, 19 Nov 2013 01:43:48 +0000 Subject: [PATCH] portmixer: Drop --with-pa-include in favor of overwriting the pkg-config check. --- lib-src/portmixer/configure | 21 --------------------- lib-src/portmixer/configure.ac | 18 +----------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/lib-src/portmixer/configure b/lib-src/portmixer/configure index 8d6140886..01e2b6967 100755 --- a/lib-src/portmixer/configure +++ b/lib-src/portmixer/configure @@ -777,7 +777,6 @@ with_gnu_ld with_sysroot enable_libtool_lock enable_debug -with_pa_include ' ac_precious_vars='build_alias host_alias @@ -1435,7 +1434,6 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-pa-include specify path to portaudio v2.0 include directory Some influential environment variables: CC C compiler command @@ -11827,18 +11825,6 @@ $as_echo "no" >&6; } fi -# -# Check for portaudio path -# - -# Check whether --with-pa-include was given. -if test "${with_pa_include+set}" = set; then : - withval=$with_pa_include; with_portaudio=$withval -else - with_portaudio="" -fi - - @@ -12051,13 +12037,6 @@ $as_echo "yes" >&6; } fi -# -# -# -if test -n "$with_portaudio"; then - PORTAUDIO_CFLAGS="-I$withval" -fi - # # Check which APIs are available # diff --git a/lib-src/portmixer/configure.ac b/lib-src/portmixer/configure.ac index 4dfab4537..532d050b5 100644 --- a/lib-src/portmixer/configure.ac +++ b/lib-src/portmixer/configure.ac @@ -35,23 +35,7 @@ AC_ARG_ENABLE([debug], [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)], [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)]) -# -# Check for portaudio path -# -AC_ARG_WITH([pa-include], - AC_HELP_STRING([--with-pa-include], - [specify path to portaudio v2.0 include directory]), - [with_portaudio=$withval], - [with_portaudio=""]) - -PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19) - -# -# -# -if test -n "$with_portaudio"; then - PORTAUDIO_CFLAGS="-I$withval" -fi +PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0 >= 19]) # # Check which APIs are available