diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:48 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 21:53:48 +0000 |
commit | b347291f1f0b0a21e9a8862a3c56a8c24b6b53af (patch) | |
tree | 65c3f358fa60c49803684558308ff2af0e8e5aa2 /configure | |
parent | 6f6f206d803c82649dd2eb87a40b55d70d03f00b (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.2@242974 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: 242522 . +# From configure.ac Revision: 242889 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -720,6 +720,8 @@ KPATHSEA XMLSTARLET FETCH DOWNLOAD +PBX_BISON +PBX_FLEX SOXMIX MD5 acx_pthread_config @@ -7630,8 +7632,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 @@ -43248,6 +43260,8 @@ KPATHSEA!$KPATHSEA$ac_delim XMLSTARLET!$XMLSTARLET$ac_delim 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 @@ -43339,8 +43353,6 @@ LDAP_LIB!$LDAP_LIB$ac_delim LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim LDAP_DIR!$LDAP_DIR$ac_delim PBX_LDAP!$PBX_LDAP$ac_delim -LIBXML2_LIB!$LIBXML2_LIB$ac_delim -LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43382,6 +43394,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +LIBXML2_LIB!$LIBXML2_LIB$ac_delim +LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim LIBXML2_DIR!$LIBXML2_DIR$ac_delim PBX_LIBXML2!$PBX_LIBXML2$ac_delim LTDL_LIB!$LTDL_LIB$ac_delim @@ -43477,8 +43491,6 @@ SDL_INCLUDE!$SDL_INCLUDE$ac_delim SDL_DIR!$SDL_DIR$ac_delim PBX_SDL!$PBX_SDL$ac_delim SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim -SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim -SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43520,6 +43532,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim +SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim OPENAIS_LIB!$OPENAIS_LIB$ac_delim OPENAIS_INCLUDE!$OPENAIS_INCLUDE$ac_delim @@ -43615,8 +43629,6 @@ PBX_DAHDI_HALF_FULL!$PBX_DAHDI_HALF_FULL$ac_delim GSM_INTERNAL!$GSM_INTERNAL$ac_delim CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim -PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim -CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -43658,6 +43670,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim +CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim PG_CONFIG!$PG_CONFIG$ac_delim PTLIB_CONFIG!$PTLIB_CONFIG$ac_delim PWLIBDIR!$PWLIBDIR$ac_delim @@ -43686,7 +43700,7 @@ PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 |