I apparently forgot to type "cvs ci". :-) Fixed.

-- Dan

On Wed, 2002-01-23 at 10:04, Ian Goldberg wrote:
> On Wed, 2002-01-23 at 08:57, Dan Winship wrote:
> > > Shouldn't configure.in say:
> > > 
> > > camel_providerdir='$(libdir)/evolution/camel-providers/'$VERSION
> > 
> > No. Camel providers should have the same API across (stable) micro and
> > nano versions.
> 
> Fair enough.
> 
> > > Alternately, use camel_providerdir in mail/Makefile.in where providerdir
> > > is used now?
> > 
> > Yup. It's supposed to be that way (and is on the stable 1.0 branch).
> > Can't imagine how anything is working for anyone if it's not.
> 
> Indeed; here's the diff between HEAD and evolution-1-0-branch:
> 
> [iang@janus mail]$ cvs diff -u -r HEAD -r evolution-1-0-branch
> Makefile.am
> Index: Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
> retrieving revision 1.154
> retrieving revision 1.154.6.1
> diff -u -r1.154 -r1.154.6.1
> --- Makefile.am       2001/10/22 23:24:01     1.154
> +++ Makefile.am       2001/12/17 17:53:09     1.154.6.1
> @@ -2,7 +2,6 @@
>  
>  bin_PROGRAMS =       evolution-mail
>  
> -providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
>  importerdir = $(libdir)/evolution/evolution-mail-importers/$(VERSION)
>  
>  INCLUDES = \
> @@ -24,7 +23,7 @@
>       -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"          \
>       -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\"      \
>       -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"        \
> -     -DCAMEL_PROVIDERDIR=\""$(providerdir)"\"        \
> +     -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\"  \
>       -DMAIL_IMPORTERSDIR=\""$(importerdir)"\"        \
>       -DG_LOG_DOMAIN=\"evolution-mail\"
>  
> 
> I also can't imagine how it's working for anyone using HEAD, unless they
> happen to have both 1.1 and 1.1.0.99 directories lying around in
> $(libdir)/evolution/camel-providers/ for some reason.  I had to make a
> symlink for it to work.
> 
> Maybe the above patch should be applied to HEAD?  [cvs annotate claims
> you (danw) fixed this on the 1.0 branch in December.]
> 
>    - Ian


_______________________________________________
evolution-hackers maillist  -  [EMAIL PROTECTED]
http://lists.ximian.com/mailman/listinfo/evolution-hackers

Reply via email to