[asterisk-commits] twilson: trunk r266289 - in /trunk: configure configure.ac makeopts.in

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri May 28 12:34:00 2010
New Revision: 266289

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=266289
Log:
More build fixes for ical/neon and res_calendar_ews

Modified:
    trunk/configure
    trunk/configure.ac
    trunk/makeopts.in

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=266289&r1=266288&r2=266289
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Fri May 28 12:34:00 2010
@@ -925,7 +925,7 @@
 # Some distributions (like RedHat) add a libical subdirectory for the headers
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_get_utc_timezone], [libical/ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])
 if test x"${PBX_ICAL}" = x1; then
-	ICAL_INCLUDE+=-I/usr/include/libical
+	ICAL_INCLUDE+=" -I/usr/include/libical"
 fi
 
 AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])

Modified: trunk/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/trunk/makeopts.in?view=diff&rev=266289&r1=266288&r2=266289
==============================================================================
--- trunk/makeopts.in (original)
+++ trunk/makeopts.in Fri May 28 12:34:00 2010
@@ -150,6 +150,8 @@
 
 NEON_INCLUDE=@NEON_INCLUDE@
 NEON_LIB=@NEON_LIB@
+NEON29_INCLUDE=@NEON_INCLUDE@
+NEON29_LIB=@NEON_LIB@
 
 NETSNMP_INCLUDE=@NETSNMP_INCLUDE@
 NETSNMP_LIB=@NETSNMP_LIB@