From fc547b5fa089e43060e56cd03a00e4ad0693a826 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 1 Dec 2008 21:23:37 +0000
Subject: [PATCH] Use AST_EXT_LIB_SETUP before using AST_EXT_LIB_CHECK or bad
things happen.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@160097 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
configure | 60 ++++++++++++++++++++++++++++++++++++++++++----------
configure.ac | 1 +
2 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index e305e86b1f..68ac795229 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 159818 .
+# From configure.ac Revision: 160062 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -902,6 +902,10 @@ SPEEX_LIB
SPEEX_INCLUDE
SPEEX_DIR
PBX_SPEEX
+SPEEX_PREPROCESS_LIB
+SPEEX_PREPROCESS_INCLUDE
+SPEEX_PREPROCESS_DIR
+PBX_SPEEX_PREPROCESS
SPEEXDSP_LIB
SPEEXDSP_INCLUDE
SPEEXDSP_DIR
@@ -1000,7 +1004,6 @@ OPENH323_BUILD
PBX_AIS
AIS_INCLUDE
AIS_LIB
-PBX_SPEEX_PREPROCESS
CONFIG_GMIME
EDITLINE_LIB
PBX_H323
@@ -1653,6 +1656,7 @@ Optional Packages:
--with-SDL_image=PATH use Sdl Image library files in PATH
--with-openais=PATH use OpenAIS files in PATH
--with-speex=PATH use Speex files in PATH
+ --with-speex=PATH use Speex preprocess routines files in PATH
--with-speexdsp=PATH use Speexdsp files in PATH
--with-sqlite=PATH use SQLite files in PATH
--with-sqlite3=PATH use SQLite files in PATH
@@ -9423,6 +9427,37 @@ fi
+ SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines"
+ SPEEX_PREPROCESS_OPTION="speex"
+ PBX_SPEEX_PREPROCESS=0
+
+# Check whether --with-speex was given.
+if test "${with_speex+set}" = set; then
+ withval=$with_speex;
+ case ${withval} in
+ n|no)
+ USE_SPEEX_PREPROCESS=no
+ # -1 is a magic value used by menuselect to know that the package
+ # was disabled, other than 'not found'
+ PBX_SPEEX_PREPROCESS=-1
+ ;;
+ y|ye|yes)
+ ac_mandatory_list="${ac_mandatory_list} SPEEX_PREPROCESS"
+ ;;
+ *)
+ SPEEX_PREPROCESS_DIR="${withval}"
+ ac_mandatory_list="${ac_mandatory_list} SPEEX_PREPROCESS"
+ ;;
+ esac
+
+fi
+
+
+
+
+
+
+
SPEEXDSP_DESCRIP="Speexdsp"
SPEEXDSP_OPTION="speexdsp"
PBX_SPEEXDSP=0
@@ -53273,14 +53308,14 @@ SPEEX_LIB!$SPEEX_LIB$ac_delim
SPEEX_INCLUDE!$SPEEX_INCLUDE$ac_delim
SPEEX_DIR!$SPEEX_DIR$ac_delim
PBX_SPEEX!$PBX_SPEEX$ac_delim
+SPEEX_PREPROCESS_LIB!$SPEEX_PREPROCESS_LIB$ac_delim
+SPEEX_PREPROCESS_INCLUDE!$SPEEX_PREPROCESS_INCLUDE$ac_delim
+SPEEX_PREPROCESS_DIR!$SPEEX_PREPROCESS_DIR$ac_delim
+PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
SPEEXDSP_LIB!$SPEEXDSP_LIB$ac_delim
SPEEXDSP_INCLUDE!$SPEEXDSP_INCLUDE$ac_delim
SPEEXDSP_DIR!$SPEEXDSP_DIR$ac_delim
PBX_SPEEXDSP!$PBX_SPEEXDSP$ac_delim
-SQLITE_LIB!$SQLITE_LIB$ac_delim
-SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
-SQLITE_DIR!$SQLITE_DIR$ac_delim
-PBX_SQLITE!$PBX_SQLITE$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -53322,6 +53357,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SQLITE_LIB!$SQLITE_LIB$ac_delim
+SQLITE_INCLUDE!$SQLITE_INCLUDE$ac_delim
+SQLITE_DIR!$SQLITE_DIR$ac_delim
+PBX_SQLITE!$PBX_SQLITE$ac_delim
SQLITE3_LIB!$SQLITE3_LIB$ac_delim
SQLITE3_INCLUDE!$SQLITE3_INCLUDE$ac_delim
SQLITE3_DIR!$SQLITE3_DIR$ac_delim
@@ -53412,13 +53451,9 @@ OPENH323_BUILD!$OPENH323_BUILD$ac_delim
PBX_AIS!$PBX_AIS$ac_delim
AIS_INCLUDE!$AIS_INCLUDE$ac_delim
AIS_LIB!$AIS_LIB$ac_delim
-PBX_SPEEX_PREPROCESS!$PBX_SPEEX_PREPROCESS$ac_delim
CONFIG_GMIME!$CONFIG_GMIME$ac_delim
EDITLINE_LIB!$EDITLINE_LIB$ac_delim
PBX_H323!$PBX_H323$ac_delim
-PBX_IXJUSER!$PBX_IXJUSER$ac_delim
-CONFIG_SDL!$CONFIG_SDL$ac_delim
-CONFIG_GTK!$CONFIG_GTK$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -53460,12 +53495,15 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PBX_IXJUSER!$PBX_IXJUSER$ac_delim
+CONFIG_SDL!$CONFIG_SDL$ac_delim
+CONFIG_GTK!$CONFIG_GTK$ac_delim
PKGCONFIG!$PKGCONFIG$ac_delim
CURL_CONFIG!$CURL_CONFIG$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.ac b/configure.ac
index ad885a28d7..bf4ed43e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,7 @@ AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
AST_EXT_LIB_SETUP([OPENAIS], [OpenAIS], [openais])
AST_EXT_LIB_SETUP([SPEEX], [Speex], [speex])
+AST_EXT_LIB_SETUP([SPEEX_PREPROCESS], [Speex preprocess routines], [speex])
AST_EXT_LIB_SETUP([SPEEXDSP], [Speexdsp], [speexdsp])
AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite])
AST_EXT_LIB_SETUP([SQLITE3], [SQLite], [sqlite3])
--
GitLab