dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(ical.h,
+AC_CHECK_HEADER(libical/ical.h,
[AC_CHECK_LIB(ical, icalcomponent_new,
[
SERVER_LIBS="-lical $SERVER_LIBS"
,
)],
[
- AC_MSG_ERROR(ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
+ AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
]
)
#include <stdio.h>
#include <string.h>
#include <strings.h>
-#include <ical.h>
+#include <libical/ical.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
-#include <ical.h>
+#include <libical/ical.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
dnl Checks for the libical iCalendar library.
-AC_CHECK_HEADER(ical.h,
+AC_CHECK_HEADER(libical/ical.h,
[AC_CHECK_LIB(ical, icalcomponent_new,
[
LIBS="-lical $LIBS"
,
)],
[
- AC_MSG_ERROR(ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
+ AC_MSG_ERROR(libical/ical.h was not found and is required. More info: http://www.citadel.org/doku.php/installation:start)
]
)
#include <zlib.h>
#endif
-
-/* Work around PACKAGE/VERSION defs that are (not supposed to be?) in ical.h */
-#ifdef PACKAGE
-# define CTDL_PACKAGE PACKAGE
-# undef PACKAGE
-#endif
-
-#ifdef PACKAGE_STRING
-# define CTDL_PACKAGE_STRING PACKAGE_STRING
-//# undef PACKAGE_STRING
-#endif
-
-#ifdef VERSION
-# define CTDL_VERSION VERSION
-# undef VERSION
-#endif
-
-#include <ical.h>
+#include <libical/ical.h>
#undef PACKAGE
#undef VERSION