kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ical library handling (again)

Browse Source 
Newer versions of libical (which we require) store the header file in a
libical/ subfolder and include an ical.h file that does a #warning for
deprecation and then #includes <libical/ical.h>. Since we now test for
libical/ical.h, we can change the #includes back to <libical/ical.h> and
remove the test which specifically adds /usr/include/libical as an include
directory.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@266386 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2010-05-28 22:54:03 +00:00
parent 2da88f1977
commit 9a2f04ce26
4 changed files with 124 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -924,9 +924,6 @@ 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"
fi
AST_EXT_LIB_CHECK([ICAL], [ical], [icaltimezone_new], [ical.h], [${PTHREAD_LIBS}], [${PTHREAD_CFLAGS}])