From 9fdbc5618decf6e2071f868be0bf01d22d7fef6f Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Fri, 28 May 2010 17:34:00 +0000
Subject: [PATCH] More build fixes for ical/neon and res_calendar_ews

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@266289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configure    | 4 ++--
 configure.ac | 2 +-
 makeopts.in  | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 6a664ec631..7ba4f4b4ab 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 265747 .
+# From configure.ac Revision: 265793 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk 1.6.
 #
@@ -16673,7 +16673,7 @@ fi
 
 
 if test x"${PBX_ICAL}" = x1; then
-	ICAL_INCLUDE+=-I/usr/include/libical
+	ICAL_INCLUDE+=" -I/usr/include/libical"
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 386ebf5fa3..c6c9337518 100644
--- a/configure.ac
+++ b/configure.ac
@@ -925,7 +925,7 @@ AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h])
 # 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}])
diff --git a/makeopts.in b/makeopts.in
index cbea640b0d..841af16d0e 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -150,6 +150,8 @@ NCURSES_DIR=@NCURSES_DIR@
 
 NEON_INCLUDE=@NEON_INCLUDE@
 NEON_LIB=@NEON_LIB@
+NEON29_INCLUDE=@NEON_INCLUDE@
+NEON29_LIB=@NEON_LIB@
 
 NETSNMP_INCLUDE=@NETSNMP_INCLUDE@
 NETSNMP_LIB=@NETSNMP_LIB@