Merged revisions 160097 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r160097 | tilghman | 2008-12-01 15:23:37 -0600 (Mon, 01 Dec 2008) | 2 lines
  
  Use AST_EXT_LIB_SETUP before using AST_EXT_LIB_CHECK or bad things happen.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@160101 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 159053 .
+# From configure.ac Revision: 159851 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -897,6 +897,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
@@ -985,7 +989,6 @@ OPENH323_BUILD
 PBX_AIS
 AIS_INCLUDE
 AIS_LIB
-PBX_SPEEX_PREPROCESS
 CONFIG_GMIME
 EDITLINE_LIB
 PBX_H323
@@ -1636,6 +1639,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
@@ -9188,6 +9192,34 @@ fi
 
 
 
+    SPEEX_PREPROCESS_DESCRIP="Speex preprocess routines"
+    SPEEX_PREPROCESS_OPTION="speex"
+
+# 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
+	;;
+	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
+
+    PBX_SPEEX_PREPROCESS=0
+
+
+
+
+
+
     SPEEXDSP_DESCRIP="Speexdsp"
     SPEEXDSP_OPTION="speexdsp"
 
@@ -51226,6 +51258,10 @@ 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
@@ -51235,10 +51271,6 @@ 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
-PBX_SQLITE3!$PBX_SQLITE3$ac_delim
-SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -51280,6 +51312,10 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SQLITE3_INCLUDE!$SQLITE3_INCLUDE$ac_delim
+SQLITE3_DIR!$SQLITE3_DIR$ac_delim
+PBX_SQLITE3!$PBX_SQLITE3$ac_delim
+SUPPSERV_LIB!$SUPPSERV_LIB$ac_delim
 SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
 SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
 PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
@@ -51355,7 +51391,6 @@ 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
@@ -51367,7 +51402,7 @@ 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` = 85; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

configure.ac

@@ -253,6 +253,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])