Same changes as made to 1.4 in revision 103710
authorMark Michelson <mmichelson@digium.com>
Fri, 15 Feb 2008 00:59:21 +0000 (00:59 +0000)
committerMark Michelson <mmichelson@digium.com>
Fri, 15 Feb 2008 00:59:21 +0000 (00:59 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103711 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configure
configure.ac
doc/tex/imapstorage.tex

index fff57ed..0e63086 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.
 #
 
 
 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
 
index 9f1287b..4838de4 100644 (file)
@@ -648,8 +648,10 @@ fi
 AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h])
 
 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}"
@@ -776,18 +778,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
@@ -1034,20 +1029,20 @@ 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
-               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
+       else
+               AC_MSG_RESULT(no) 
        fi
 fi
 
index ee93e96..c690ad2 100644 (file)
@@ -60,7 +60,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
@@ -69,9 +70,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.