kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 07:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

I apparently misunderstood one of the requirements of this configure change.

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@103709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-02-15 00:50:49 +00:00
parent 2bd91c05b5
commit 2ee7626928
3 changed files with 59 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 103674 . # From configure.ac Revision: 103698 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4. # Generated by GNU Autoconf 2.61 for asterisk 1.4.
# #
@@ -19271,8 +19271,10 @@ fi
fi fi
if test "${USE_IMAP_TK}" != "no"; then if test "${USE_IMAP_TK}" != "no"; then
switch_to_system_on_failure="no"
if test "${IMAP_TK_DIR}" = ""; then if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g" IMAP_TK_DIR=`pwd`"/../imap-2004g"
switch_to_system_on_failure="yes"
fi fi
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}" saved_libs="${LIBS}"
@@ -19474,28 +19476,12 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
fi fi
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}" LIBS="${saved_libs}"
if test "${ac_cv_imap_tk}" = "yes"; then if test "${ac_cv_imap_tk}" = "no"; 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
{ echo "$as_me:$LINENO: result: no" >&5 { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; } 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
fi fi
if test "${IMAP_TK_DIR}" = "system"; then 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 conftest$ac_exeext conftest.$ac_ext
fi fi
fi fi
if test "${ac_cv_imap_tk}" = "yes"; then fi
{ echo "$as_me:$LINENO: result: yes" >&5 if test "${ac_cv_imap_tk}" = "yes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; } echo "${ECHO_T}yes" >&6; }
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}" LIBS="${saved_libs}"
IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
IMAP_TK_INCLUDE="${imap_include}" IMAP_TK_INCLUDE="${imap_include}"
PBX_IMAP_TK=1 PBX_IMAP_TK=1
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_IMAP_TK 1 #define HAVE_IMAP_TK 1
_ACEOF _ACEOF
if test "${ac_cv_imap_tk2006}" = "yes"; then if test "${ac_cv_imap_tk2006}" = "yes"; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_IMAP_TK2006 1 #define HAVE_IMAP_TK2006 1
_ACEOF _ACEOF
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: ***" >&6;}
{ 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: *** Either correct the installation, or run configure" >&6;}
{ 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
echo "${ECHO_T}no" >&6; }
fi 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: ***" >&6;}
{ 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: *** Either correct the installation, or run configure" >&6;}
{ 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
echo "${ECHO_T}no" >&6; }
fi fi
fi fi

57
configure.ac
View File

@@ -479,8 +479,10 @@ if test "${PBX_IKSEMEL}" = 1; then
fi fi
if test "${USE_IMAP_TK}" != "no"; then if test "${USE_IMAP_TK}" != "no"; then
switch_to_system_on_failure="no"
if test "${IMAP_TK_DIR}" = ""; then if test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g" IMAP_TK_DIR=`pwd`"/../imap-2004g"
switch_to_system_on_failure="yes"
fi fi
saved_cppflags="${CPPFLAGS}" saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}" saved_libs="${LIBS}"
@@ -607,18 +609,11 @@ if test "${USE_IMAP_TK}" != "no"; then
fi fi
CPPFLAGS="${saved_cppflags}" CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}" LIBS="${saved_libs}"
if test "${ac_cv_imap_tk}" = "yes"; then if test "${ac_cv_imap_tk}" = "no"; 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
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
IMAP_TK_DIR="system" if test "${switch_to_system_on_failure}" = "yes"; then
IMAP_TK_DIR="system"
fi
fi fi
fi fi
if test "${IMAP_TK_DIR}" = "system"; then if test "${IMAP_TK_DIR}" = "system"; then
@@ -865,27 +860,27 @@ if test "${USE_IMAP_TK}" != "no"; then
) )
fi fi
fi fi
if test "${ac_cv_imap_tk}" = "yes"; then fi
AC_MSG_RESULT(yes) if test "${ac_cv_imap_tk}" = "yes"; then
CPPFLAGS="${saved_cppflags}" AC_MSG_RESULT(yes)
LIBS="${saved_libs}" CPPFLAGS="${saved_cppflags}"
IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}` LIBS="${saved_libs}"
IMAP_TK_INCLUDE="${imap_include}" IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
PBX_IMAP_TK=1 IMAP_TK_INCLUDE="${imap_include}"
AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.]) PBX_IMAP_TK=1
if test "${ac_cv_imap_tk2006}" = "yes"; then AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.]) if test "${ac_cv_imap_tk2006}" = "yes"; then
fi AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
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
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
fi fi

6
doc/imapstorage.txt
View File

@@ -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. A second configure option is to not specify a directory (i.e.
./configure --with-imap). This will assume that you have the ./configure --with-imap). This will assume that you have the
imap-2004g source installed in the .. directory relative to 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 A third option is ./configure --with-imap=system. This will assume
that you have installed a dynamically linked version of the c-client 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 your include path starting with the imap directory, and upon failure,
in the c-client directory. 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 When you run 'make menuselect', choose 'Voicemail Build Options' and the
IMAP_STORAGE option should be available for selection. IMAP_STORAGE option should be available for selection.