You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
evolution-data-server/evolution-data-server-2.25....

30 lines
1.6 KiB

diff -up evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in
--- evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in.libical-includedir 2009-01-27 21:57:57.000000000 -0500
+++ evolution-data-server-2.25.90/calendar/libecal/libecal.pc.in 2009-02-04 12:46:35.000000000 -0500
@@ -9,10 +9,11 @@ idldir=@idldir@
IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
privincludedir=@privincludedir@
+libical_includedir=@libical_includedir@
Name: libecal
Description: Client library for evolution calendars
Version: @VERSION@
Requires: libbonobo-2.0 >= @LIBBONOBO_REQUIRED@ libical >= @LIBICAL_REQUIRED@ libedataserver-1.2
Libs: -L${libdir} -lecal-1.2
-Cflags: -I${privincludedir}
+Cflags: -I${privincludedir} -I${libical_includedir}
diff -up evolution-data-server-2.25.90/configure.in.libical-includedir evolution-data-server-2.25.90/configure.in
--- evolution-data-server-2.25.90/configure.in.libical-includedir 2009-02-04 12:26:26.000000000 -0500
+++ evolution-data-server-2.25.90/configure.in 2009-02-04 12:46:35.000000000 -0500
@@ -1534,6 +1534,9 @@ dnl --- evolution-calendar flags
if test "x${enable_calendar}" = "xyes"; then
EVOLUTION_CALENDAR_DEPS="libical >= libical_minimum_version libxml-2.0 libbonobo-2.0 gio-2.0 gobject-2.0 gthread-2.0 gconf-2.0"
+ libical_includedir=`$PKG_CONFIG --variable=includedir libical`
+ AC_SUBST(libical_includedir)
+
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)