[asterisk-commits] kpfleming: branch 1.6.0 r107407 - in /branches/1.6.0: ./ include/asterisk/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue Mar 11 08:59:27 2008
New Revision: 107407

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107407
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=107407&r1=107406&r2=107407
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Tue Mar 11 08:59:27 2008
@@ -788,7 +788,7 @@
 				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}"

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=107407&r1=107406&r2=107407
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Tue Mar 11 08:59:27 2008
@@ -1043,6 +1043,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