diff options
| -rwxr-xr-x | configure | 165 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 | ||||
| -rw-r--r-- | pbx/pbx_lua.c | 6 | ||||
| -rw-r--r-- | res/res_calendar_caldav.c | 10 | ||||
| -rw-r--r-- | res/res_calendar_ews.c | 16 | ||||
| -rw-r--r-- | res/res_calendar_exchange.c | 10 | ||||
| -rw-r--r-- | res/res_calendar_icalendar.c | 10 |
8 files changed, 117 insertions, 116 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 263905 . +# From configure.ac Revision: 264249 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -25378,6 +25378,7 @@ fi +# Some distributions (like RedHat) add a libical subdirectory for the headers if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then pbxlibdir="" @@ -25389,7 +25390,7 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then pbxlibdir="-L${ICAL_DIR}" fi fi - pbxfuncname="icaltimezone_new" + pbxfuncname="icaltimezone_get_utc_timezone" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ICAL_FOUND=yes else @@ -25475,23 +25476,23 @@ fi ICAL_INCLUDE="-I${ICAL_DIR}/include" fi ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xical.h" = "x" ; then # no header, assume found + if test "xlibical/ical.h" = "x" ; then # no header, assume found ICAL_HEADER_FOUND="1" else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}" - if test "${ac_cv_header_ical_h+set}" = set; then - { echo "$as_me:$LINENO: checking for ical.h" >&5 -echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ical_h+set}" = set; then + if test "${ac_cv_header_libical_ical_h+set}" = set; then + { echo "$as_me:$LINENO: checking for libical/ical.h" >&5 +echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libical_ical_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking ical.h usability" >&5 -echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking libical/ical.h usability" >&5 +echo $ECHO_N "checking libical/ical.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25499,7 +25500,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <ical.h> +#include <libical/ical.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25531,15 +25532,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking ical.h presence" >&5 -echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking libical/ical.h presence" >&5 +echo $ECHO_N "checking libical/ical.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <ical.h> +#include <libical/ical.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -25572,25 +25573,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libical/ical.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: ical.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libical/ical.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libical/ical.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libical/ical.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libical/ical.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -25599,18 +25600,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for ical.h" >&5 -echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_ical_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for libical/ical.h" >&5 +echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libical_ical_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_ical_h=$ac_header_preproc + ac_cv_header_libical_ical_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; } fi -if test $ac_cv_header_ical_h = yes; then +if test $ac_cv_header_libical_ical_h = yes; then ICAL_HEADER_FOUND=1 else ICAL_HEADER_FOUND=0 @@ -25636,8 +25637,10 @@ _ACEOF fi +if test x"${PBX_ICAL}" = x1; then + ICAL_INCLUDE+=-I/usr/include/libical +fi -# Some distributions (like RedHat) add a libical subdirectory for the headers if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then pbxlibdir="" @@ -25649,7 +25652,7 @@ if test "x${PBX_ICAL}" != "x1" -a "${USE_ICAL}" != "no"; then pbxlibdir="-L${ICAL_DIR}" fi fi - pbxfuncname="icaltimezone_get_utc_timezone" + pbxfuncname="icaltimezone_new" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_ICAL_FOUND=yes else @@ -25735,23 +25738,23 @@ fi ICAL_INCLUDE="-I${ICAL_DIR}/include" fi ICAL_INCLUDE="${ICAL_INCLUDE} ${PTHREAD_CFLAGS}" - if test "xlibical/ical.h" = "x" ; then # no header, assume found + if test "xical.h" = "x" ; then # no header, assume found ICAL_HEADER_FOUND="1" else # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${ICAL_INCLUDE}" - if test "${ac_cv_header_libical_ical_h+set}" = set; then - { echo "$as_me:$LINENO: checking for libical/ical.h" >&5 -echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libical_ical_h+set}" = set; then + if test "${ac_cv_header_ical_h+set}" = set; then + { echo "$as_me:$LINENO: checking for ical.h" >&5 +echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ical_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking libical/ical.h usability" >&5 -echo $ECHO_N "checking libical/ical.h usability... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ical.h usability" >&5 +echo $ECHO_N "checking ical.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -25759,7 +25762,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include <libical/ical.h> +#include <ical.h> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -25791,15 +25794,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking libical/ical.h presence" >&5 -echo $ECHO_N "checking libical/ical.h presence... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking ical.h presence" >&5 +echo $ECHO_N "checking ical.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <libical/ical.h> +#include <ical.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in @@ -25832,25 +25835,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: libical/ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: libical/ical.h: proceeding with the compiler's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: ical.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: ical.h: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: libical/ical.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: libical/ical.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: libical/ical.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: libical/ical.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: libical/ical.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: libical/ical.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libical/ical.h: in the future, the compiler will take precedence" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: ical.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: ical.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: ical.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: ical.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: ical.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: ical.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: ical.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX ## ------------------------------- ## ## Report this to www.asterisk.org ## @@ -25859,18 +25862,18 @@ _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac -{ echo "$as_me:$LINENO: checking for libical/ical.h" >&5 -echo $ECHO_N "checking for libical/ical.h... $ECHO_C" >&6; } -if test "${ac_cv_header_libical_ical_h+set}" = set; then +{ echo "$as_me:$LINENO: checking for ical.h" >&5 +echo $ECHO_N "checking for ical.h... $ECHO_C" >&6; } +if test "${ac_cv_header_ical_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_header_libical_ical_h=$ac_header_preproc + ac_cv_header_ical_h=$ac_header_preproc fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_libical_ical_h" >&5 -echo "${ECHO_T}$ac_cv_header_libical_ical_h" >&6; } +{ echo "$as_me:$LINENO: result: $ac_cv_header_ical_h" >&5 +echo "${ECHO_T}$ac_cv_header_ical_h" >&6; } fi -if test $ac_cv_header_libical_ical_h = yes; then +if test $ac_cv_header_ical_h = yes; then ICAL_HEADER_FOUND=1 else ICAL_HEADER_FOUND=0 @@ -40590,11 +40593,11 @@ fi if test "x${PBX_LUA}" = "x1" ; then - -cat >>confdefs.h <<_ACEOF -#define LUA51_PREFIX 1 -_ACEOF - + if test x"${LUA_DIR}" = x; then + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" + else + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" + fi fi # Some distributions (like SuSE) remove the 5.1 suffix. diff --git a/configure.ac b/configure.ac index 944860e0d..ce2fb73e2 100644 --- a/configure.ac +++ b/configure.ac @@ -921,10 +921,13 @@ AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h]) # Some versions of Linux package iconv in glibc AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h]) -AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}]) - # 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 +fi + +AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}]) AST_EXT_LIB_CHECK([IKSEMEL], [iksemel], [iks_start_sasl], [iksemel.h]) @@ -1662,7 +1665,11 @@ fi AST_EXT_LIB_CHECK([LUA], [lua5.1], [luaL_newstate], [lua5.1/lua.h], [-lm]) if test "x${PBX_LUA}" = "x1" ; then - AC_DEFINE_UNQUOTED([LUA51_PREFIX], [1], [Define to 1 if lua is found with a lua5.1 prefix]) + if test x"${LUA_DIR}" = x; then + LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua5.1" + else + LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua5.1" + fi fi # Some distributions (like SuSE) remove the 5.1 suffix. diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index f6e1dae7c..70e34113b 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1020,9 +1020,6 @@ slash. */ #undef LSTAT_FOLLOWS_SLASHED_SYMLINK -/* Define to 1 if lua is found with a lua5.1 prefix */ -#undef LUA51_PREFIX - /* Build chan_misdn for mISDN 1.2 or later. */ #undef MISDN_1_2 diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c index 2aac40951..e292117a3 100644 --- a/pbx/pbx_lua.c +++ b/pbx/pbx_lua.c @@ -42,15 +42,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/paths.h" #include "asterisk/hashtab.h" -#ifdef LUA51_PREFIX -#include <lua5.1/lua.h> -#include <lua5.1/lauxlib.h> -#include <lua5.1/lualib.h> -#else #include <lua.h> #include <lauxlib.h> #include <lualib.h> -#endif static char *config = "extensions.lua"; static char *registrar = "pbx_lua"; diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c index 5cf9c99aa..63b6a6ba6 100644 --- a/res/res_calendar_caldav.c +++ b/res/res_calendar_caldav.c @@ -29,11 +29,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include <libical/ical.h> -#include <neon/ne_session.h> -#include <neon/ne_uri.h> -#include <neon/ne_request.h> -#include <neon/ne_auth.h> +#include <ical.h> +#include <ne_session.h> +#include <ne_uri.h> +#include <ne_request.h> +#include <ne_auth.h> #include <libxml/xmlmemory.h> #include <libxml/parser.h> diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c index bd6a1eecd..17723b569 100644 --- a/res/res_calendar_ews.c +++ b/res/res_calendar_ews.c @@ -27,14 +27,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include <neon/ne_request.h> -#include <neon/ne_session.h> -#include <neon/ne_uri.h> -#include <neon/ne_socket.h> -#include <neon/ne_auth.h> -#include <neon/ne_xml.h> -#include <neon/ne_xmlreq.h> -#include <neon/ne_utils.h> +#include <ne_request.h> +#include <ne_session.h> +#include <ne_uri.h> +#include <ne_socket.h> +#include <ne_auth.h> +#include <ne_xml.h> +#include <ne_xmlreq.h> +#include <ne_utils.h> #include "asterisk/module.h" #include "asterisk/calendar.h" diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c index a68146623..2c121bc96 100644 --- a/res/res_calendar_exchange.c +++ b/res/res_calendar_exchange.c @@ -29,11 +29,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include <libical/ical.h> -#include <neon/ne_session.h> -#include <neon/ne_uri.h> -#include <neon/ne_request.h> -#include <neon/ne_auth.h> +#include <ical.h> +#include <ne_session.h> +#include <ne_uri.h> +#include <ne_request.h> +#include <ne_auth.h> #include <iksemel.h> #include "asterisk/module.h" diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c index 096eac1d0..8c0966528 100644 --- a/res/res_calendar_icalendar.c +++ b/res/res_calendar_icalendar.c @@ -28,11 +28,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#include <libical/ical.h> -#include <neon/ne_session.h> -#include <neon/ne_uri.h> -#include <neon/ne_request.h> -#include <neon/ne_auth.h> +#include <ical.h> +#include <ne_session.h> +#include <ne_uri.h> +#include <ne_request.h> +#include <ne_auth.h> #include "asterisk/module.h" #include "asterisk/calendar.h" |