kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +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
# 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,28 +19476,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
@@ -19891,42 +19877,42 @@ 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
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
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