diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 00:59:21 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 00:59:21 +0000 |
| commit | 0142926ab096193d6af25a257545dab942b1f3c7 (patch) | |
| tree | 5b984ef46f2cf7056419590cf7f942e8463c5359 /configure | |
| parent | cd237a6e755ffad69cca5959fe9a4425f4f0517d (diff) | |
Same changes as made to 1.4 in revision 103710
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103711 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 52 |
1 files changed, 19 insertions, 33 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 103694 . +# From configure.ac Revision: 103700 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -32477,8 +32477,10 @@ fi if test "${USE_IMAP_TK}" != "no"; then + switch_to_system_on_failure="no" if test "${IMAP_TK_DIR}" = ""; then IMAP_TK_DIR=`pwd`"/../imap-2004g" + switch_to_system_on_failure="yes" fi saved_cppflags="${CPPFLAGS}" saved_libs="${LIBS}" @@ -32680,28 +32682,12 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - if test "${ac_cv_imap_tk}" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` - IMAP_TK_INCLUDE="${imap_include}" - PBX_IMAP_TK=1 - -cat >>confdefs.h <<\_ACEOF -#define HAVE_IMAP_TK 1 -_ACEOF - - if test "${ac_cv_imap_tk2006}" = "yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_IMAP_TK2006 1 -_ACEOF - - fi - else + if test "${ac_cv_imap_tk}" = "no"; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - IMAP_TK_DIR="system" + if test "${switch_to_system_on_failure}" = "yes"; then + IMAP_TK_DIR="system" + fi fi fi if test "${IMAP_TK_DIR}" = "system"; then @@ -33097,30 +33083,30 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi fi - if test "${ac_cv_imap_tk}" = "yes"; then - { echo "$as_me:$LINENO: result: yes" >&5 + fi + if test "${ac_cv_imap_tk}" = "yes"; then + { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - CPPFLAGS="${saved_cppflags}" - LIBS="${saved_libs}" - IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` - IMAP_TK_INCLUDE="${imap_include}" - PBX_IMAP_TK=1 + CPPFLAGS="${saved_cppflags}" + LIBS="${saved_libs}" + IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` + IMAP_TK_INCLUDE="${imap_include}" + PBX_IMAP_TK=1 cat >>confdefs.h <<\_ACEOF #define HAVE_IMAP_TK 1 _ACEOF - if test "${ac_cv_imap_tk2006}" = "yes"; then + if test "${ac_cv_imap_tk2006}" = "yes"; then cat >>confdefs.h <<\_ACEOF #define HAVE_IMAP_TK2006 1 _ACEOF - fi - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } fi + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi |