aboutsummaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-28 22:54:03 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-28 22:54:03 +0000
commit0cff654a6951abdf1310df3f14ad88914ad5d43c (patch)
tree4598231a4295feb0a052960a44db2722a1f16dbe /configure.ac
parent5696c8402789c5f835bc4428c3bea8204cf01352 (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: http://svn.digium.com/svn/asterisk/trunk@266386 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
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}])