| @@ -16,25 +16,47 @@
SPEEX=@PBX_SPEEX@
SQLITE=@PBX_SQLITE@
SSL=@PBX_OPENSSL@
---- configure.ac.orig 2007-09-14 10:01:16.000000000 +0200
-+++ configure.ac 2007-09-14 10:01:29.000000000 +0200
-@@ -179,6 +179,7 @@
- AST_EXT_LIB_SETUP([IMAP_TK], [UW IMAP Toolkit], [imap])
+--- makeopts.in.orig 2007-09-14 10:04:35.000000000 +0200
++++ makeopts.in 2007-09-14 10:04:57.000000000 +0200
+@@ -97,6 +97,9 @@
+ IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
+ IMAP_TK_LIB=@IMAP_TK_LIB@
+
++LDAP_INCLUDE=@LDAP_INCLUDE@
++LDAP_LIB=@LDAP_LIB@
++
+ KDEDIR=@KDEDIR@
+ KDE_INCLUDE=@KDE_INCLUDE@
+ KDE_LIB=@KDE_LIB@
+@@ -140,6 +143,9 @@
+ RADIUS_INCLUDE=@RADIUS_INCLUDE@
+ RADIUS_LIB=@RADIUS_LIB@
+
++SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
++SPANDSP_LIB=@SPANDSP_LIB@
++
+ SPEEX_INCLUDE=@SPEEX_INCLUDE@
+ SPEEX_LIB=@SPEEX_LIB@
+
+--- configure.ac.orig 2010-07-02 23:36:39.000000000 +0200
++++ configure.ac 2010-08-26 22:51:09.214588794 +0200
+@@ -240,6 +240,7 @@
AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
AST_EXT_LIB_SETUP([KDE], [KDE], [kde])
+ AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])
-@@ -196,6 +197,7 @@
- AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
- AST_EXT_LIB_SETUP([QT], [Qt], [qt])
+@@ -259,6 +260,7 @@
+ AST_EXT_LIB_SETUP_DEPENDENT([PRI_INBANDDISCONNECT], [ISDN PRI set_inbanddisconnect], [PRI], [pri])
+ AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib])
AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
+AST_EXT_LIB_SETUP([SPANDSP], [spandsp Library], [spandsp])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
- AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
- AST_EXT_LIB_SETUP([SUPPSERV], [mISDN Supplemental Services], [suppserv])
-@@ -679,6 +681,8 @@
+ AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
+ AST_EXT_LIB_SETUP_DEPENDENT([SPEEX_PREPROCESS], [speex_preprocess_ctl], [], [speex])
+@@ -1258,6 +1260,8 @@
AC_LANG_POP
@@ -43,7 +65,7 @@
AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
if test "${PBX_MISDN}" = 1; then
-@@ -941,6 +945,8 @@
+@@ -1452,6 +1456,8 @@
AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h])
@@ -51,26 +73,4 @@
+
AST_EXT_LIB_CHECK([SPEEX], [speex], [speex_encode], [speex/speex.h], [-lm])
- AST_EXT_LIB_CHECK([SQLITE], [sqlite], [sqlite_exec], [sqlite.h])
---- makeopts.in.orig 2007-09-14 10:04:35.000000000 +0200
-+++ makeopts.in 2007-09-14 10:04:57.000000000 +0200
-@@ -97,6 +97,9 @@
- IMAP_TK_INCLUDE=@IMAP_TK_INCLUDE@
- IMAP_TK_LIB=@IMAP_TK_LIB@
-
-+LDAP_INCLUDE=@LDAP_INCLUDE@
-+LDAP_LIB=@LDAP_LIB@
-+
- KDEDIR=@KDEDIR@
- KDE_INCLUDE=@KDE_INCLUDE@
- KDE_LIB=@KDE_LIB@
-@@ -140,6 +143,9 @@
- RADIUS_INCLUDE=@RADIUS_INCLUDE@
- RADIUS_LIB=@RADIUS_LIB@
-
-+SPANDSP_INCLUDE=@SPANDSP_INCLUDE@
-+SPANDSP_LIB=@SPANDSP_LIB@
-+
- SPEEX_INCLUDE=@SPEEX_INCLUDE@
- SPEEX_LIB=@SPEEX_LIB@
-
+ # See if the main speex library contains the preprocess functions
|
