aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 13:59:27 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-11 13:59:27 +0000
commit114dba5629140f851413ccef41c8c23aa22650d8 (patch)
tree448fd11c06e748e87d036eeb5888e4288f019603
parentf45ff7f7a5d10592332e39b66383f5772fda3ffe (diff)
Merged revisions 107406 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r107406 | kpfleming | 2008-03-11 08:58:37 -0500 (Tue, 11 Mar 2008) | 10 lines 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@107407 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac2
-rw-r--r--include/asterisk/autoconfig.h.in6
3 files changed, 9 insertions, 3 deletions
diff --git a/configure b/configure
index 7a4b4336b..b913c425c 100755
--- 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 85e7aa2b0..3834a1626 100644
--- 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 1e0f6c5c7..51864ff8c 100644
--- 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