diff options
| author | Terry Wilson <twilson@digium.com> | 2010-05-28 22:54:03 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2010-05-28 22:54:03 +0000 |
| commit | 9a2f04ce26cb6a6a10245af34a781b6150ba30a8 (patch) | |
| tree | 4598231a4295feb0a052960a44db2722a1f16dbe /configure.ac | |
| parent | 2da88f1977295c7945a2cd3a5c6a79246439ccd0 (diff) | |
Fix ical library handling (again)
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index c6c933751..63bb5c13f 100644 --- a/configure.ac +++ b/configure.ac @@ -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}]) |