diff options
| -rw-r--r-- | apps/Makefile | 10 | ||||
| -rwxr-xr-x | configure | 146 | ||||
| -rw-r--r-- | configure.ac | 84 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 |
4 files changed, 239 insertions, 4 deletions
diff --git a/apps/Makefile b/apps/Makefile index c772be786..afb12389b 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -16,7 +16,15 @@ endif SELECTED_MODS:=$(filter-out $(MENUSELECT_APPS),$(patsubst %.c,%,$(wildcard app_*.c))) -MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) $(MENUSELECT_DEPENDS_EXTENDED_ODBC_STORAGE) +ifneq ($(findstring ODBC_STORAGE,$(MENUSELECT_app_voicemail)),) +MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_ODBC_STORAGE) +endif +ifneq ($(findstring EXTENDED_ODBC_STORAGE,$(MENUSELECT_app_voicemail)),) +MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_EXTENDED_ODBC_STORAGE) +endif +ifneq ($(findstring IMAP_STORAGE,$(MENUSELECT_app_voicemail)),) +MENUSELECT_DEPENDS_app_voicemail+=$(MENUSELECT_DEPENDS_IMAP_STORAGE) +endif all: _all @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 37086 . +# From configure.ac Revision: 37105 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59e. # @@ -16423,7 +16423,149 @@ fi if test "${USE_IMAP_TK}" != "no"; then if test "${IMAP_TK_DIR}" = ""; then - IMAP_TK_DIR=../imap-2004g + IMAP_TK_DIR=`pwd`"/../imap-2004g" + fi + echo -n "checking for UW IMAP Toolkit c-client library... " + saved_cppflags="${CPPFLAGS}" + saved_libs="${LIBS}" + imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` + CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client" + LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`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" +int +main () +{ + + void mm_searched (MAILSTREAM *stream,unsigned long number) + { + } + void mm_exists (MAILSTREAM *stream,unsigned long number) + { + } + void mm_expunged (MAILSTREAM *stream,unsigned long number) + { + } + void mm_flags (MAILSTREAM *stream,unsigned long number) + { + } + void mm_notify (MAILSTREAM *stream,char *string,long errflg) + { + } + void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) + { + } + void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) + { + } + void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status) + { + } + void mm_log (char *string,long errflg) + { + } + void mm_dlog (char *string) + { + } + void mm_login (NETMBX *mb,char *user,char *pwd,long trial) + { + } + void mm_critical (MAILSTREAM *stream) + { + } + void mm_nocritical (MAILSTREAM *stream) + { + } + long mm_diskerror (MAILSTREAM *stream,long errcode,long serious) + { + } + void mm_fatal (char *string) + { + } + int main() + { + MAILSTREAM *foo = mail_open(NULL, "", 0); + } + + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_imap_tk="yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_imap_tk="no" + +fi + +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + 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_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}` + IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client" + PBX_IMAP_TK=1 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_IMAP_TK 1 +_ACEOF + + elif test ! -z "${IMAP_TK_MANDATORY}"; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + echo "***" + echo "*** The UW IMAP Toolkit installation on this system appears to be broken." + echo "*** Either correct the installation, or run configure" + echo "*** including --without-imap." + exit 1 + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi diff --git a/configure.ac b/configure.ac index 4a6b924f4..555463d16 100644 --- a/configure.ac +++ b/configure.ac @@ -336,7 +336,89 @@ AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h]) if test "${USE_IMAP_TK}" != "no"; then if test "${IMAP_TK_DIR}" = ""; then - IMAP_TK_DIR=../imap-2004g + IMAP_TK_DIR=`pwd`"/../imap-2004g" + fi + echo -n "checking for UW IMAP Toolkit c-client library... " + saved_cppflags="${CPPFLAGS}" + saved_libs="${LIBS}" + imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS` + CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client" + LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}` + AC_LINK_IFELSE( + AC_LANG_PROGRAM( + [#include "c-client.h"], + [ + void mm_searched (MAILSTREAM *stream,unsigned long number) + { + } + void mm_exists (MAILSTREAM *stream,unsigned long number) + { + } + void mm_expunged (MAILSTREAM *stream,unsigned long number) + { + } + void mm_flags (MAILSTREAM *stream,unsigned long number) + { + } + void mm_notify (MAILSTREAM *stream,char *string,long errflg) + { + } + void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) + { + } + void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes) + { + } + void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status) + { + } + void mm_log (char *string,long errflg) + { + } + void mm_dlog (char *string) + { + } + void mm_login (NETMBX *mb,char *user,char *pwd,long trial) + { + } + void mm_critical (MAILSTREAM *stream) + { + } + void mm_nocritical (MAILSTREAM *stream) + { + } + long mm_diskerror (MAILSTREAM *stream,long errcode,long serious) + { + } + void mm_fatal (char *string) + { + } + int main() + { + MAILSTREAM *foo = mail_open(NULL, "", 0); + } + ] + ), + [ac_cv_imap_tk="yes"], + [ac_cv_imap_tk="no"] + ) + CPPFLAGS="${saved_cppflags}" + LIBS="${saved_libs}" + if test "${ac_cv_imap_tk}" = "yes"; then + AC_MSG_RESULT(yes) + IMAP_TK_LIB="${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}` + IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/c-client" + PBX_IMAP_TK=1 + AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.]) + elif test ! -z "${IMAP_TK_MANDATORY}"; then + AC_MSG_RESULT(no) + echo "***" + echo "*** The UW IMAP Toolkit installation on this system appears to be broken." + echo "*** Either correct the installation, or run configure" + echo "*** including --without-imap." + exit 1 + else + AC_MSG_RESULT(no) fi fi diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index d1f2ce8c4..5e571bb3d 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -121,6 +121,9 @@ /* Define to indicate the ${IKSEMEL_DESCRIP} library */ #undef HAVE_IKSEMEL +/* Define if your system has the UW IMAP Toolkit c-client library. */ +#undef HAVE_IMAP_TK + /* Define to 1 if you have the `inet_ntoa' function. */ #undef HAVE_INET_NTOA |