kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 23:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 160097 via svnmerge from

Browse Source 
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.0@160100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-01 21:45:00 +00:00
parent 470870f3fc
commit 2ce0cada61
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 157601 .
# From configure.ac Revision: 159855 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -889,6 +889,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
@@ -973,7 +977,6 @@ OPENH323_INCDIR
OPENH323_LIBDIR
OPENH323_SUFFIX
OPENH323_BUILD
PBX_SPEEX_PREPROCESS
CONFIG_GMIME
EDITLINE_LIB
PBX_H323
@@ -1622,6 +1625,7 @@ Optional Packages:
--with-sdl=PATH use Sdl files in PATH
--with-SDL_image=PATH use Sdl Image library 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
@@ -9118,6 +9122,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"
@@ -50279,6 +50311,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
@@ -50296,10 +50332,6 @@ SUPPSERV_INCLUDE!$SUPPSERV_INCLUDE$ac_delim
SUPPSERV_DIR!$SUPPSERV_DIR$ac_delim
PBX_SUPPSERV!$PBX_SUPPSERV$ac_delim
OPENSSL_LIB!$OPENSSL_LIB$ac_delim
OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
OPENSSL_DIR!$OPENSSL_DIR$ac_delim
PBX_OPENSSL!$PBX_OPENSSL$ac_delim
FREETDS_LIB!$FREETDS_LIB$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -50341,6 +50373,10 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
OPENSSL_INCLUDE!$OPENSSL_INCLUDE$ac_delim
OPENSSL_DIR!$OPENSSL_DIR$ac_delim
PBX_OPENSSL!$PBX_OPENSSL$ac_delim
FREETDS_LIB!$FREETDS_LIB$ac_delim
FREETDS_INCLUDE!$FREETDS_INCLUDE$ac_delim
FREETDS_DIR!$FREETDS_DIR$ac_delim
PBX_FREETDS!$PBX_FREETDS$ac_delim
@@ -50404,7 +50440,6 @@ OPENH323_INCDIR!$OPENH323_INCDIR$ac_delim
OPENH323_LIBDIR!$OPENH323_LIBDIR$ac_delim
OPENH323_SUFFIX!$OPENH323_SUFFIX$ac_delim
OPENH323_BUILD!$OPENH323_BUILD$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
@@ -50416,7 +50451,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` = 73; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

1
configure.ac
View File

@@ -251,6 +251,7 @@ AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])
AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl])
AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image])
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])