[svn-commits] mmichelson: branch 1.4 r103709 - in /branches/1.4: ./ doc/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Feb 14 18:50:49 2008
New Revision: 103709

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103709
Log:
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.


Modified:
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/doc/imapstorage.txt

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=103709&r1=103708&r2=103709
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Thu Feb 14 18:50:49 2008
@@ -479,8 +479,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}"
@@ -607,18 +609,11 @@
 		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 @@
 				)
 			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
 

Modified: branches/1.4/doc/imapstorage.txt
URL: http://svn.digium.com/view/asterisk/branches/1.4/doc/imapstorage.txt?view=diff&rev=103709&r1=103708&r2=103709
==============================================================================
--- branches/1.4/doc/imapstorage.txt (original)
+++ branches/1.4/doc/imapstorage.txt Thu Feb 14 18:50:49 2008
@@ -75,7 +75,8 @@
 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
@@ -83,9 +84,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.