mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 07:35:18 +00:00
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. 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
28
configure
vendored
28
configure
vendored
@@ -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,30 +19476,14 @@ 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; }
|
||||
if test "${switch_to_system_on_failure}" = "yes"; then
|
||||
IMAP_TK_DIR="system"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "${IMAP_TK_DIR}" = "system"; then
|
||||
#We will enter here if user specified "system" or if any of above checks failed
|
||||
{ echo "$as_me:$LINENO: checking for system c-client library..." >&5
|
||||
@@ -19891,6 +19877,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "${ac_cv_imap_tk}" = "yes"; then
|
||||
{ echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6; }
|
||||
@@ -19928,7 +19915,6 @@ echo "$as_me: *** including --without-imap." >&6;}
|
||||
echo "${ECHO_T}no" >&6; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Needed by unixodbc
|
||||
|
||||
|
||||
17
configure.ac
17
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,20 +609,13 @@ 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)
|
||||
if test "${switch_to_system_on_failure}" = "yes"; then
|
||||
IMAP_TK_DIR="system"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "${IMAP_TK_DIR}" = "system"; then
|
||||
#We will enter here if user specified "system" or if any of above checks failed
|
||||
AC_MSG_CHECKING([for system c-client library...])
|
||||
@@ -865,6 +860,7 @@ if test "${USE_IMAP_TK}" != "no"; then
|
||||
)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "${ac_cv_imap_tk}" = "yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
CPPFLAGS="${saved_cppflags}"
|
||||
@@ -887,7 +883,6 @@ if test "${USE_IMAP_TK}" != "no"; then
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Needed by unixodbc
|
||||
AST_EXT_LIB_CHECK([LTDL], [ltdl], [lt_dlinit], [ltdl.h], [])
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user