Merged revisions 107405 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r107405 | kpfleming | 2008-03-11 08:57:08 -0500 (Tue, 11 Mar 2008) | 2 lines

fix small bug in IMAP toolkit testing

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107406 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 7a4b433..b913c42 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 104019 .
+# From configure.ac Revision: 104045 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -32681,7 +32681,7 @@ echo $ECHO_N "checking for system c-client library...... $ECHO_C" >&6; }
                                CPPFLAGS="${saved_cppflags}"
                                LIBS="${saved_libs}"
                                imap_include="-I${IMAP_TK_DIR}/include"
-                               imap_ldflags="-I${IMAP_TK_DIR}/lib"
+                               imap_ldflags="-L${IMAP_TK_DIR}/lib"
                                imap_libs="-lc-client"
                                CPPFLAGS="${CPPFLAGS} ${imap_include}"
                                LIBS="${LIBS} ${imap_libs} ${imap_ldflags}"

diff --git a/configure.ac b/configure.ac
index 85e7aa2..3834a16 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -788,7 +788,7 @@ if test "${USE_IMAP_TK}" != "no"; then
                                CPPFLAGS="${saved_cppflags}"
                                LIBS="${saved_libs}"
                                imap_include="-I${IMAP_TK_DIR}/include"
-                               imap_ldflags="-I${IMAP_TK_DIR}/lib"
+                               imap_ldflags="-L${IMAP_TK_DIR}/lib"
                                imap_libs="-lc-client"
                                CPPFLAGS="${CPPFLAGS} ${imap_include}"
                                LIBS="${LIBS} ${imap_libs} ${imap_ldflags}"

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 1e0f6c5..51864ff 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -1044,6 +1044,12 @@
 /* Define ZAPTEL_HWGAIN headers version */
 #undef HAVE_ZAPTEL_HWGAIN_VERSION
 
+/* Define if your system has the ZAPTEL_NEONMWI headers. */
+#undef HAVE_ZAPTEL_NEONMWI
+
+/* Define ZAPTEL_NEONMWI headers version */
+#undef HAVE_ZAPTEL_NEONMWI_VERSION
+
 /* Define if your system has the ZAPTEL_TRANSCODE headers. */
 #undef HAVE_ZAPTEL_TRANSCODE