diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-17 17:42:20 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-17 17:42:20 +0000 |
| commit | e598d4ebf0436995816f5cf20ffd3149d39c3b8a (patch) | |
| tree | 8a50d2fbce9097beec9f92933dcf69a4d84f890c /configure.ac | |
| parent | 97d86cd7189459b135069d97c42f8ee0bbbf7f88 (diff) | |
Merged revisions 109166 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r109166 | kpfleming | 2008-03-17 12:31:46 -0500 (Mon, 17 Mar 2008) | 3 lines
don't define Zaptel features as libraries, they aren't, and we don't want '--with-zaptel-<foo>' configure options for them
also some minor cleanups
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@109167 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 4db42316c..ccf91473e 100644 --- a/configure.ac +++ b/configure.ac @@ -207,6 +207,7 @@ AST_EXT_LIB_SETUP([CAP], [POSIX 1.e capabilities], [cap]) AST_EXT_LIB_SETUP([CURL], [cURL], [curl]) AST_EXT_LIB_SETUP([CURSES], [curses], [curses]) AST_EXT_LIB_SETUP([CRYPTO], [OpenSSL Cryptography support], [crypto]) +AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec]) AST_EXT_LIB_SETUP([GSM], [External GSM library], [gsm], [, use 'internal' GSM otherwise]) AST_EXT_LIB_SETUP([GTK], [gtk libraries], [gtk]) AST_EXT_LIB_SETUP([GTK2], [gtk2 libraries], [gtk2]) @@ -234,7 +235,9 @@ AST_EXT_LIB_SETUP([PRI], [ISDN PRI], [pri]) AST_EXT_LIB_SETUP([SS7], [ISDN SS7], [ss7]) AST_EXT_LIB_SETUP([PWLIB], [PWlib], [pwlib]) AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) -AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius]) +AST_EXT_LIB_SETUP([RADIUS], [Radius Client], [radius])A +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([SPEEXDSP], [Speexdsp], [speexdsp]) AST_EXT_LIB_SETUP([SQLITE], [SQLite], [sqlite]) @@ -251,16 +254,6 @@ AST_EXT_LIB_SETUP([VPB], [Voicetronix API], [vpb]) AST_EXT_LIB_SETUP([X11], [X11 support], [x11]) AST_EXT_LIB_SETUP([ZLIB], [zlib], [z]) AST_EXT_LIB_SETUP([ZAPTEL], [Zaptel], [zaptel]) -AST_EXT_LIB_SETUP([ZAPTEL_TRANSCODE], [Zaptel Transcoder Support], [zaptel_transcode]) -AST_EXT_LIB_SETUP([ZAPTEL_VLDTMF], [Zaptel VLDTMF Support], [zaptel_vldtmf]) -AST_EXT_LIB_SETUP([ZAPTEL_HWGAIN], [Zaptel Hardware Gain Support], [zaptel_hwgain]) -AST_EXT_LIB_SETUP([ZAPTEL_NEONMWI], [Zaptel Neon MWI Support], [zaptel_neonmwi]) -AST_EXT_LIB_SETUP([ZAPTEL_ECHOCANPARAMS], [Zaptel Echo Canceler Parameter Support], [zaptel_echocanparams]) -AST_EXT_LIB_SETUP([ZAPTEL_CHANALARMS], [Zaptel Channel Alarm Support], [zaptel_chanalarms]) - -AST_EXT_LIB_SETUP([SDL], [Sdl], [sdl]) -AST_EXT_LIB_SETUP([SDL_IMAGE], [Sdl Image library], [SDL_image]) -AST_EXT_LIB_SETUP([FFMPEG], [Ffmpeg and avcodec library], [avcodec]) # check for basic system features and functionality before # checking for package libraries |