From 94ace09b40ec881bdeb9a62af03e984e6f15c54b Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Fri, 6 Sep 2013 09:22:30 +0100
Subject: [PATCH] configure.ac: Improve the checks to ensure that portaudio.h
 and -lportaudio refer to the same version of PortAudio.

---
 configure.ac | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2d081b33..73441b0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,11 +58,19 @@ if test "$with_portaudio" = "no"; then
 else
     AC_CHECK_HEADERS([portaudio.h],
         [
-            AC_CHECK_LIB([portaudio], [Pa_IsStreamActive],
+            # Check the portaudio library.
+            AC_CHECK_LIB([portaudio], [Pa_IsStreamActive]) # portaudio 19
+            AC_CHECK_LIB([portaudio], [Pa_StreamActive])   # portaudio 18
+
+            # Then use the headers to determine the portaudio version.
+            # This is because on some systems with both libportaudio0 and
+            # libportaudio2 installed, portaudio.h and -lportaudio refer
+            # to different versions.
+            AC_CHECK_FUNC([Pa_IsStreamActive],
                 [
                     have_portaudio=19
                 ],[
-                    AC_CHECK_LIB([portaudio], [Pa_StreamActive],
+                    AC_CHECK_FUNC([Pa_StreamActive],
                         [
                             have_portaudio=18
                         ],[