r2600 - trunk/libminisip

[mikma at minisip.org]

Author: mikma
Date: 2006-06-01 16:37:04 +0200 (Thu, 01 Jun 2006)
New Revision: 2600

Modified:
   trunk/libminisip/configure.ac
Log:
Use pkg-config when checking for PortAudio V19/2.0 support.


Modified: trunk/libminisip/configure.ac
===================================================================
--- trunk/libminisip/configure.ac	2006-06-01 14:33:52 UTC (rev 2599)
+++ trunk/libminisip/configure.ac	2006-06-01 14:37:04 UTC (rev 2600)
@@ -154,16 +154,23 @@
 
 if test ! x$enable_portaudio = xno; then
    have_portaudio=yes
-   AC_CHECK_HEADERS([portaudio.h],,have_portaudio=no)
-   AC_CHECK_LIB([portaudio],[Pa_GetDefaultOutputDevice],[PORTAUDIO_LIBS=-lportaudio],have_portaudio=no)
+   PKG_CHECK_MODULES(PORTAUDIO,[portaudio-2.0],[
+      CPPFLAGS_SAVE="${CPPFLAGS}"
+      CPPFLAGS="${CPPFLAGS} ${PORTAUDIO_CFLAGS}"
+      AC_CHECK_HEADERS([portaudio.h],[
+         LIBS_SAVE="${LIBS}"
+         LIBS="${PORTAUDIO_LIBS} ${LIBS}"
+         AC_SEARCH_LIBS([Pa_GetDefaultOutputDevice],[],[],[have_portaudio=no])
+         LIBS="${LIBS_SAVE}"
+      ],[have_portaudio=no])
+      CPPFLAGS="${CPPFLAGS_SAVE}"
+   ],[have_portaudio=no])
 
    if test x$have_portaudio = xyes; then
       AC_DEFINE(PORTAUDIO_SUPPORT, [1], [PortAudio V19 SoundDevice support.])
    elif test x$enable_portaudio = xyes; then
       AC_MSG_ERROR([Could not find PortAudio requirement(s).])
    fi
-
-   AC_SUBST(PORTAUDIO_LIBS)
 fi
 AM_CONDITIONAL([PORTAUDIO_SUPPORT], [test x$have_portaudio = xyes])