actually do proper searching for c-client and output the results so app_voicemail...
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 7 Jul 2006 02:20:04 +0000 (02:20 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 7 Jul 2006 02:20:04 +0000 (02:20 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37278 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/Makefile
configure
configure.ac
include/asterisk/autoconfig.h.in

index c772be7..afb1238 100644 (file)
@@ -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
 
index 513b279..0bce970 100755 (executable)
--- a/configure
+++ b/configure
@@ -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.
 #
 
 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
 
index 4a6b924..555463d 100644 (file)
@@ -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
 
index d1f2ce8..5e571bb 100644 (file)
 /* 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