Re: More cleaning patch

On Monday 13 November 2006 00:49, Régis Boudin wrote:
> Hi,
>
> Here are a couple of patches :
>
> The first, cleanup.diff is a small patch doing some trivial cleanups.
>
> In configure.in :
> -fixes a typo at the beginning of configure.in (extra '+' at the
> beginning of the line)
> -sets AMAYA_OPTIONS, then add the AMAYA_DEBUG switch if required instead
> of having a long duplicated string.
> -stop including OS_OPTIONS within AMAYA_ANNOT_OPTIONS. The later is
> always used together with AMAYA_OPTIONS which already includes it.
> -remove the EXTRA_LIBS value, which is always empty
> -only call AC_SUBST_FILE once for the xxx_frag's
>
> In amaya/Makefile.in :
> -remove reference to EXTRA_LIBS
> -minor typo with double '/'
> -remove trailing '\'
>
> In annotlib/Makefile.in :
> -remove reference to AMAYA_ANNOT_OPTIONS, which is already included in
> OPTIONS
>
> In other files, only remove references to EXTRA_LIBS.

This set of patches is now integrated. I also removed references to NOGUI

> Additionally, raptor_cleanup.diff applies on top of cleanup, removing
> the reference to libraptor.a (which is already linked inside librdf.a)
> and the system to build raptor, which is completely useless. Even if it
> is called, the only bit making reference what gets built in is commented
> in amaya/Makefile.in.

When I apply this patch, raptor modules inside redland don't compile and the 
Amaya version cannot be generated.

> Last, redland_configure_in_configure.diff moves the call to configure
> for Redland from the Makefile.in to configure.in, in line with what is
> done for Mesa and WxWidgets.

Not applied due to previous problem.

> As usual, comments are welcome.
>
> HTH,
> Regis

Regards
     Irène.
-----
Irène Vatton                     INRIA Rhône-Alpes
INRIA                               ZIRST
e-mail: [email protected]       655 avenue de l'Europe
Tel.: +33 4 76 61 53 61             Montbonnot
Fax:  +33 4 76 61 52 07             38334 Saint Ismier Cedex - France