kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow compilation off app_voicemail with IMAP_STORAE against a system installed

Browse Source 
version of the c-client library.  (issue #10047, jcollie)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71688 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-06-25 19:20:07 +00:00
parent 82e2033519
commit ab56fcce5c
4 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 67029 .
# From configure.ac Revision: 69703 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@@ -19102,7 +19102,10 @@ fi
fi
if test "${USE_IMAP_TK}" != "no"; then
if test "${IMAP_TK_DIR}" = ""; then
if test "${IMAP_TK_DIR}" = "system" ; then
{ echo "$as_me:$LINENO: Checking for system c-client library..." >&5
echo "$as_me: Checking for system c-client library..." >&6;}
elif test "${IMAP_TK_DIR}" = ""; then
IMAP_TK_DIR=`pwd`"/../imap-2004g"
if test -n "${IMAP_TK_MANDATORY}"; then
{ echo "$as_me:$LINENO: The --with-imap option does not search your system for installed" >&5
@@ -19115,22 +19118,34 @@ echo "$as_me: the configure script will assume you have placed built the c-clien
echo "$as_me: files at ${IMAP_TK_DIR}, as outlined in the doc/imapstorage.txt file." >&6;}
fi
fi
{ echo "$as_me:$LINENO: checking for UW IMAP Toolkit c-client library" >&5
if test "${IMAP_TK_DIR}" != "system" ; then
{ 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; }
fi
saved_cppflags="${CPPFLAGS}"
saved_libs="${LIBS}"
if test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
if test "${IMAP_TK_DIR}" = "system" ; then
imap_ldflags=""
imap_libs="-lc-client"
imap_include="-DUSE_SYSTEM_IMAP"
elif test -f ${IMAP_TK_DIR}/c-client/LDFLAGS ; then
imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
imap_include="-I${IMAP_TK_DIR}/c-client"
fi
CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
CPPFLAGS="${CPPFLAGS} ${imap_include}"
LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "c-client.h"
#ifdef USE_SYSTEM_IMAP
#include <imap/c-client.h>
#else
#include "c-client.h"
#endif
void mm_searched (MAILSTREAM *stream,unsigned long number)
{
}
@@ -19223,7 +19238,11 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include "c-client.h"
#ifdef USE_SYSTEM_IMAP
#include <imap/c-client.h>
#else
#include "c-client.h"
#endif
void mm_searched (MAILSTREAM *stream,unsigned long number)
{
}
@@ -19315,8 +19334,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
if test "${ac_cv_imap_tk}" = "yes"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
IMAP_TK_LIB="${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client"
IMAP_TK_LIB="${imap_libs}"`echo ${imap_ldflags}`
IMAP_TK_INCLUDE="${imap_include}"
PBX_IMAP_TK=1
cat >>confdefs.h <<\_ACEOF