The changes look ok to me. Perhaps we should just move the definition of EVO_SET_COMPILE_FLAGS to acinclude.m4 though?
-- dobey On Tue, 2005-04-05 at 21:32 +0200, ERDI Gergo wrote: > Hi, > > The following patch fixes evolution's and eds's configure.in. the problem > is that EVO_SET_COMPILE_FLAGS uses EVOLUTION as the sole prefix for > PKG_CHECK_MODULES calls, and thus after the first call, it gets the same > cached results back. > > > Index: configure.in > =================================================================== > RCS file: /cvs/gnome/evolution/configure.in,v > retrieving revision 1.797 > diff -u -u -r1.797 configure.in > --- configure.in 5 Apr 2005 07:28:30 -0000 1.797 > +++ configure.in 5 Apr 2005 19:29:29 -0000 > @@ -1083,9 +1083,9 @@ > deps="$2" > extra_cflags="$3" > extra_libs="$4" > - PKG_CHECK_MODULES(EVOLUTION, $deps) > - $1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags" > - $1_LIBS="$EVOLUTION_LIBS $extra_libs" > + PKG_CHECK_MODULES(EVOLUTION_$1, $deps) > + $1_CFLAGS="$EVOLUTION_$1_CFLAGS \$(WERROR) $extra_cflags" > + $1_LIBS="$EVOLUTION_$1_LIBS $extra_libs" > ]) > > dnl enable USE_GTKFILECHOOSER if gtk version is > 2.4.0 > > Index: evolution-data-server/configure.in > =================================================================== > RCS file: /cvs/gnome/evolution-data-server/configure.in,v > retrieving revision 1.96 > diff -u -u -r1.96 configure.in > --- evolution-data-server/configure.in 1 Apr 2005 05:06:11 -0000 > 1.96 > +++ evolution-data-server/configure.in 5 Apr 2005 19:30:20 -0000 > @@ -1020,9 +1020,9 @@ > deps="$2" > extra_cflags="$3" > extra_libs="$4" > - PKG_CHECK_MODULES(EVOLUTION, $deps) > - $1_CFLAGS="$EVOLUTION_CFLAGS \$(WERROR) $extra_cflags" > - $1_LIBS="$EVOLUTION_LIBS $extra_libs" > + PKG_CHECK_MODULES(EVOLUTION_$1, $deps) > + $1_CFLAGS="$EVOLUTION_$1_CFLAGS \$(WERROR) $extra_cflags" > + $1_LIBS="$EVOLUTION_$1_LIBS $extra_libs" > ]) > > dnl --- Flags to get all the GNOME stuff > > _______________________________________________ evolution-hackers maillist - [email protected] http://lists.ximian.com/mailman/listinfo/evolution-hackers
