diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 00:50:49 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-15 00:50:49 +0000 |
commit | 6c316f0bc2cb41650b9963aef8dd805753b3a6b6 (patch) | |
tree | 13efadfff8339a0b7e0546e7002cb5549aa803ca /configure | |
parent | 8714d1c3b96c535dc4c2790a8a9b4ddb87422456 (diff) |
I apparently misunderstood one of the requirements of this configure change.
Now, if a source directory is specified with the --with-imap option, and a valid
source installation is not detected there, then configure will fail and will not
check for a package installation.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@103709 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 66 |
1 files changed, 26 insertions, 40 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 103674 . +# From configure.ac Revision: 103698 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -19271,8 +19271,10 @@ fi 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}" @@ -19474,28 +19476,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 @@ -19891,42 +19877,42 @@ 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 - elif test -n "${IMAP_TK_MANDATORY}"; then - { echo "$as_me:$LINENO: result: no" >&5 + fi + elif test -n "${IMAP_TK_MANDATORY}"; then + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: ***" >&5 + { echo "$as_me:$LINENO: ***" >&5 echo "$as_me: ***" >&6;} - { echo "$as_me:$LINENO: *** The UW IMAP Toolkit installation on this system appears to be broken." >&5 + { echo "$as_me:$LINENO: *** The UW IMAP Toolkit installation on this system appears to be broken." >&5 echo "$as_me: *** The UW IMAP Toolkit installation on this system appears to be broken." >&6;} - { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 + { echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5 echo "$as_me: *** Either correct the installation, or run configure" >&6;} - { echo "$as_me:$LINENO: *** including --without-imap." >&5 + { echo "$as_me:$LINENO: *** including --without-imap." >&5 echo "$as_me: *** including --without-imap." >&6;} - exit 1 - else - { echo "$as_me:$LINENO: result: no" >&5 + exit 1 + else + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - fi fi fi |