diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:37 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:37 +0000 |
commit | 04adcd4050ddc83b924ed24e721cc23b407f758d (patch) | |
tree | dbe3c25e847af10cfb8efab4d171e4eeba5d8c3a /configure | |
parent | 1ea432bb9ff23ee3c8dfb5bc2cb7350787bdaf7c (diff) |
Merged revisions 242967,242971 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242967 | tilghman | 2010-01-25 15:38:33 -0600 (Mon, 25 Jan 2010) | 9 lines
Merged revisions 242966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242966 | tilghman | 2010-01-25 15:36:33 -0600 (Mon, 25 Jan 2010) | 2 lines
Only rebuild parsers by an option in menuselect
........
................
r242971 | tilghman | 2010-01-25 15:51:41 -0600 (Mon, 25 Jan 2010) | 9 lines
Merged revisions 242969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242969 | tilghman | 2010-01-25 15:50:22 -0600 (Mon, 25 Jan 2010) | 2 lines
Err, and use the new menuselect define, too.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@242973 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 30 |
1 files changed, 22 insertions, 8 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 242523 . +# From configure.ac Revision: 242887 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -718,6 +718,8 @@ RUBBER KPATHSEA FETCH DOWNLOAD +PBX_BISON +PBX_FLEX SOXMIX MD5 acx_pthread_config @@ -7502,8 +7504,18 @@ fi echo "${ECHO_T}$ac_cv_path_BISON2" >&6; } if test "x${ac_cv_path_BISON2}" = "x" ; then BISON=: + PBX_BISON=0 +else + PBX_BISON=1 fi +if test "x${FLEX}" = "x:" ; then + PBX_FLEX=0 +else + PBX_FLEX=1 +fi + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}soxmix", so it can be a program name with args. set dummy ${ac_tool_prefix}soxmix; ac_word=$2 @@ -40951,6 +40963,8 @@ for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF FETCH!$FETCH$ac_delim DOWNLOAD!$DOWNLOAD$ac_delim +PBX_BISON!$PBX_BISON$ac_delim +PBX_FLEX!$PBX_FLEX$ac_delim SOXMIX!$SOXMIX$ac_delim MD5!$MD5$ac_delim acx_pthread_config!$acx_pthread_config$ac_delim @@ -41044,8 +41058,6 @@ LUA_DIR!$LUA_DIR$ac_delim PBX_LUA!$PBX_LUA$ac_delim MISDN_LIB!$MISDN_LIB$ac_delim MISDN_INCLUDE!$MISDN_INCLUDE$ac_delim -MISDN_DIR!$MISDN_DIR$ac_delim -PBX_MISDN!$PBX_MISDN$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41087,6 +41099,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +MISDN_DIR!$MISDN_DIR$ac_delim +PBX_MISDN!$PBX_MISDN$ac_delim NBS_LIB!$NBS_LIB$ac_delim NBS_INCLUDE!$NBS_INCLUDE$ac_delim NBS_DIR!$NBS_DIR$ac_delim @@ -41182,8 +41196,6 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41225,6 +41237,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -41320,8 +41334,6 @@ PBX_H323!$PBX_H323$ac_delim PBX_IXJUSER!$PBX_IXJUSER$ac_delim CONFIG_SDL!$CONFIG_SDL$ac_delim CONFIG_GTK!$CONFIG_GTK$ac_delim -PKGCONFIG!$PKGCONFIG$ac_delim -_libcurl_config!$_libcurl_config$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -41363,10 +41375,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PKGCONFIG!$PKGCONFIG$ac_delim +_libcurl_config!$_libcurl_config$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |