planner r909 - in trunk: . libplanner

[mvdpot svn gnome org]

Author: mvdpot
Date: Sun Apr 20 10:48:31 2008
New Revision: 909
URL: http://svn.gnome.org/viewvc/planner?rev=909&view=rev

Log:
2008-04-20  Maurice van der Pot  <griffon26 kfk4ever com>

	* configure.in: Enabling evolution data server backend support caused
	configure to fail (bug #528971). Thanks to Robin Cook <rcook wyrms net> for
	noticing and providing a patch.
	* libplanner/Makefile.am: Adding -lm to LIBADD for libplanner as suggested
	by Marcin Banasiak <megabajt pld-linux org>, hopefully fixing bug #528582
	reported by Patryk Zawadzki <patrys pld-linux org>.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libplanner/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Apr 20 10:48:31 2008
@@ -282,18 +282,17 @@
 if test "x$enable_eds_backend" = "xyes" ; then
     EDS_REQUIRED=1.1.0 
     EDS_PACKAGE=1.2
-    EVOLUTION_PACKAGE=2.2
     EVOLUTION_REQUIRED=2.1.3
     PKG_CHECK_MODULES(EDS_BACKEND, 
     [
 		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
     		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
     		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
-    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
+    		evolution-plugin >= $EVOLUTION_REQUIRED
     ])
     extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
     AC_SUBST(extensiondir)
-    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
+    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
     AC_SUBST(plugindir)
     use_eds_backend=yes
 else

Modified: trunk/libplanner/Makefile.am
==============================================================================
--- trunk/libplanner/Makefile.am	(original)
+++ trunk/libplanner/Makefile.am	Sun Apr 20 10:48:31 2008
@@ -56,7 +56,7 @@
 	mrp-error.h				\
 	mrp-paths.h
 
-libplanner_1_la_LIBADD = $(LIBPLANNER_LIBS)
+libplanner_1_la_LIBADD = $(LIBPLANNER_LIBS) -lm
 
 libplannerincludedir = $(includedir)/planner-1.0/libplanner