--- configure.in.old	2009-07-28 00:50:23.000000000 +0200
+++ configure.in	2009-07-28 00:19:46.000000000 +0200
@@ -407,6 +407,8 @@
 AC_SUBST(WANPIPE_HWEC_INC)
 
 HAVE_SOUNDCARD=no
+AC_ARG_ENABLE(oss,AC_HELP_STRING([--enable-oss],[Enable OSS (default: yes)]),enable_oss=$enableval,enable_oss=yes)
+if [[ "x$enable_oss" = "xyes" ]]; then
 AC_MSG_CHECKING([for sound card headers])
 AC_TRY_COMPILE([
 #include <sys/stat.h>
@@ -425,9 +427,12 @@
 HAVE_SOUNDCARD="yes"
 )
 AC_MSG_RESULT([$HAVE_SOUNDCARD])
+fi
 AC_SUBST(HAVE_SOUNDCARD)
 
 HAVE_ALSA=no
+AC_ARG_ENABLE(alsa,AC_HELP_STRING([--enable-alsa],[Enable ALSA (default: yes)]),enable_alsa=$enableval,enable_alsa=yes)
+if [[ "x$enable_alsa" = "xyes" ]]; then
 AC_MSG_CHECKING([for ALSA headers])
 AC_TRY_COMPILE([
 #if defined(__linux__)
@@ -444,6 +449,7 @@
 HAVE_ALSA="yes"
 )
 AC_MSG_RESULT([$HAVE_ALSA])
+fi
 AC_SUBST(HAVE_ALSA)
 
 
@@ -470,20 +476,35 @@
 
 HAVE_ILBC=no
 ILBC_INC=""
-AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),want_ilbc=$enableval,want_ilbc=yes)
-if [[ "x$want_ilbc" = "xyes" ]]; then
-AC_MSG_CHECKING([for iLBC in libs])
-	basedir=`cd "$srcdir" && pwd`
-	incilbc="libs/ilbc"
-        if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
+SYSTEM_ILBC=no
+AC_ARG_ENABLE(ilbc,AC_HELP_STRING([--enable-ilbc],[Enable iLBC codec (default: yes)]),ac_cv_use_ilbc=$enableval,ac_cv_use_ilbc=yes)
+if [[ "x$ac_cv_use_ilbc" = "xyes" ]]; then
+for i in /usr/include /usr/include/ilbc /usr/local/include /usr/local/include/ilbc; do
+    ac_cv_use_ilbc="$i"
+    test -f "$ac_cv_use_ilbc/iLBC_encode.h" && break
+done
+fi
+if [[ "x$ac_cv_use_ilbc" != "xno" ]]; then
+AC_MSG_CHECKING([for iLBC_encode.h in $ac_cv_use_ilbc])
+if [[ -f "$ac_cv_use_ilbc/iLBC_encode.h" ]]; then
+    HAVE_ILBC=yes
+    ILBC_INC="-I$ac_cv_use_ilbc"
+		SYSTEM_ILBC=yes
+else
+  AC_MSG_CHECKING([for iLBC in libs])
+  basedir=`cd "$srcdir" && pwd`
+  incilbc="libs/ilbc"
+  if [[ -f "$basedir/$incilbc/iLBC_encode.h" ]]; then
 		HAVE_ILBC=yes
 		ILBC_INC="-I$basedir/$incilbc"
-		ILBC_DEP="../$incilbc/libilbc.a"
+		SYSTEM_ILBC=no
 	fi
+fi
 AC_MSG_RESULT([$HAVE_ILBC])
 fi
 AC_SUBST(HAVE_ILBC)
 AC_SUBST(ILBC_INC)
+AC_SUBST(SYSTEM_ILBC)
 
 
 HAVE_SPEEX=no
--- modules/Makefile.in.old	2009-07-28 00:50:36.000000000 +0200
+++ modules/Makefile.in	2009-07-28 00:48:51.000000000 +0200
@@ -233,8 +233,12 @@
 server/mgcpgw.yate server/mgcpca.yate: LOCALFLAGS = -I@top_srcdir@/libs/ymgcp
 server/mgcpgw.yate server/mgcpca.yate: LOCALLIBS = ../libs/ymgcp/libyatemgcp.a
 
+ifeq (@SYSTEM_ILBC@,yes)
+ilbccodec.yate: LOCALLIBS = -lilbc
+else
 ilbccodec.yate: ../libs/ilbc/libilbc.a
 ilbccodec.yate: LOCALLIBS = ../libs/ilbc/libilbc.a
+endif
 ilbccodec.yate: LOCALFLAGS = @ILBC_INC@
 
 gsmcodec.yate: LOCALLIBS = -lgsm