diff options
-rwxr-xr-x | configure | 66 | ||||
-rw-r--r-- | configure.ac | 57 | ||||
-rw-r--r-- | doc/imapstorage.txt | 6 |
3 files changed, 54 insertions, 75 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 diff --git a/configure.ac b/configure.ac index 64e97329f..63fd4d437 100644 --- a/configure.ac +++ b/configure.ac @@ -479,8 +479,10 @@ if test "${PBX_IKSEMEL}" = 1; then 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}" @@ -607,18 +609,11 @@ if test "${USE_IMAP_TK}" != "no"; then fi CPPFLAGS="${saved_cppflags}" LIBS="${saved_libs}" - if test "${ac_cv_imap_tk}" = "yes"; then - AC_MSG_RESULT(yes) - IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` - IMAP_TK_INCLUDE="${imap_include}" - PBX_IMAP_TK=1 - AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.]) - if test "${ac_cv_imap_tk2006}" = "yes"; then - AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.]) - fi - else + if test "${ac_cv_imap_tk}" = "no"; then AC_MSG_RESULT(no) - 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 @@ -865,27 +860,27 @@ if test "${USE_IMAP_TK}" != "no"; then ) fi fi - if test "${ac_cv_imap_tk}" = "yes"; then - AC_MSG_RESULT(yes) - CPPFLAGS="${saved_cppflags}" - LIBS="${saved_libs}" - IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` - IMAP_TK_INCLUDE="${imap_include}" - PBX_IMAP_TK=1 - AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.]) - if test "${ac_cv_imap_tk2006}" = "yes"; then - AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.]) - fi - elif test -n "${IMAP_TK_MANDATORY}"; then - AC_MSG_RESULT(no) - AC_MSG_NOTICE([***]) - AC_MSG_NOTICE([*** The UW IMAP Toolkit installation on this system appears to be broken.]) - AC_MSG_NOTICE([*** Either correct the installation, or run configure]) - AC_MSG_NOTICE([*** including --without-imap.]) - exit 1 - else - AC_MSG_RESULT(no) + fi + if test "${ac_cv_imap_tk}" = "yes"; then + AC_MSG_RESULT(yes) + CPPFLAGS="${saved_cppflags}" + LIBS="${saved_libs}" + IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` + IMAP_TK_INCLUDE="${imap_include}" + PBX_IMAP_TK=1 + AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.]) + if test "${ac_cv_imap_tk2006}" = "yes"; then + AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.]) fi + elif test -n "${IMAP_TK_MANDATORY}"; then + AC_MSG_RESULT(no) + AC_MSG_NOTICE([***]) + AC_MSG_NOTICE([*** The UW IMAP Toolkit installation on this system appears to be broken.]) + AC_MSG_NOTICE([*** Either correct the installation, or run configure]) + AC_MSG_NOTICE([*** including --without-imap.]) + exit 1 + else + AC_MSG_RESULT(no) fi fi diff --git a/doc/imapstorage.txt b/doc/imapstorage.txt index 3188141ba..9ee5b7891 100644 --- a/doc/imapstorage.txt +++ b/doc/imapstorage.txt @@ -75,7 +75,8 @@ or where ever you built thfe UWashington IMAP Toolkit. A second configure option is to not specify a directory (i.e. ./configure --with-imap). This will assume that you have the imap-2004g source installed in the .. directory relative to the -Asterisk source. +Asterisk source. If you do not have this source, then configure will +default to the "system" option defined in the next paragraph A third option is ./configure --with-imap=system. This will assume that you have installed a dynamically linked version of the c-client @@ -84,9 +85,6 @@ attempt to link agains -lc-client and will search for c-client headers in your include path starting with the imap directory, and upon failure, in the c-client directory. -Note that if you attempt one of the first two configuration options for -IMAP and it fails, the "system" option will be automatically attempted. - When you run 'make menuselect', choose 'Voicemail Build Options' and the IMAP_STORAGE option should be available for selection. |