diff options
| author | Terry Wilson <twilson@digium.com> | 2010-05-28 17:34:00 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-05-28 17:34:00 +0000 |
| commit | 9fdbc5618decf6e2071f868be0bf01d22d7fef6f (patch) | |
| tree | 25a67423d57170ba19b1c5e4791540f7dd201b89 | |
| parent | a370bc1522fd93946e29d1e06f096866cb3009ca (diff) | |
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
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | makeopts.in | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -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 386ebf5fa..c6c933751 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 cbea640b0..841af16d0 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@ |