[asterisk-commits] kpfleming: trunk r53716 - in /trunk: ./ doc/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Feb  9 10:43:36 2007
New Revision: 53716

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53716
Log:
Merged revisions 53715 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53715 | kpfleming | 2007-02-09 10:42:22 -0600 (Fri, 09 Feb 2007) | 2 lines

clarify the fact that voicemail IMAP storage cannot be built against a distro's binary c-client library package (at least not at this time)

........

Modified:
    trunk/   (props changed)
    trunk/configure
    trunk/configure.ac
    trunk/doc/imapstorage.txt

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=53716&r1=53715&r2=53716
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Fri Feb  9 10:43:36 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 52463 .
+# From configure.ac Revision: 52998 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -18878,6 +18878,14 @@
 if test "${USE_IMAP_TK}" != "no"; then
    if test "${IMAP_TK_DIR}" = ""; then
       IMAP_TK_DIR=`pwd`"/../imap-2004g"
+      { echo "$as_me:$LINENO: The --with-imap option does not search your system for installed" >&5
+echo "$as_me: The --with-imap option does not search your system for installed" >&6;}
+      { echo "$as_me:$LINENO: c-client library/header files. Since you did not provide a path" >&5
+echo "$as_me: c-client library/header files. Since you did not provide a path" >&6;}
+      { echo "$as_me:$LINENO: the configure script will assume you have placed built the c-client" >&5
+echo "$as_me: the configure script will assume you have placed built the c-client" >&6;}
+      { echo "$as_me:$LINENO: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&5
+echo "$as_me: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&6;}
    fi
    { echo "$as_me:$LINENO: checking for UW IMAP Toolkit c-client library" >&5
 echo $ECHO_N "checking for UW IMAP Toolkit c-client library... $ECHO_C" >&6; }

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=53716&r1=53715&r2=53716
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri Feb  9 10:43:36 2007
@@ -428,6 +428,10 @@
 if test "${USE_IMAP_TK}" != "no"; then
    if test "${IMAP_TK_DIR}" = ""; then
       IMAP_TK_DIR=`pwd`"/../imap-2004g"
+      AC_MSG_NOTICE([The --with-imap option does not search your system for installed])
+      AC_MSG_NOTICE([c-client library/header files. Since you did not provide a path])
+      AC_MSG_NOTICE([the configure script will assume you have placed built the c-client])
+      AC_MSG_NOTICE([files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file.])
    fi
    AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
    saved_cppflags="${CPPFLAGS}"

Modified: trunk/doc/imapstorage.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/imapstorage.txt?view=diff&rev=53716&r1=53715&r2=53716
==============================================================================
--- trunk/doc/imapstorage.txt (original)
+++ trunk/doc/imapstorage.txt Fri Feb  9 10:43:36 2007
@@ -73,6 +73,12 @@
 or where ever you built thfe UWashington IMAP Toolkit. When you run
 'make menuselect', choose 'Voicemail Build Options' and the
 IMAP_STORAGE option should be available for selection.
+
+Note that the --with-imap option will NOT search your system for an
+installed copy of the IMAP Toolkit c-client library; the Asterisk
+Makefiles and configure script are designed to build against an
+unpacked and compiled source tree of the IMAP Toolkit, not a binary
+distribution.
 
 After selecting it, use the 'x' key to exit menuselect and save
 your changes, and the build/install Asterisk normally.