Patches, was: Amaya 9.54

Hi,

>> I will submit my various patches later, it would be nice if we could get
>> one (maybe two) merged into CVS...
>
> Okay

So, as promised, here are the patches I apply for the Debian package to
build/link against shared libraries instead of built-in ones. They are to
be applied on top of each other in this order :
-rdf_conf_in_conf.diff
-raptor_split.diff
-enable_system_libwww.diff

First, a quick note. The file amaya/Makefile.in seems to have been
modified in Widows at some point, and has trailing ^M at the end of the
lines, so the patch might be unhappy about it.
The third patch is for information at the moment, and probably still has
some rough edges, though it works fine for me.

The first patch moves the call to the redland configure into configure
instead of the Makefile. I believe this is a cleaner design, and it
prepares for the second patch.

The second one splits the redland and raptor configurations and adds some
auto-detection:
- Redland or raptor will be automatically used depending on the activated
options (annot needs raptor, bookmarks need redland which includes
raptor).
- If only raptor is needed, redland wont be built and/or linked against.
- If --enable-system-{raptor,redland} is used, the shared libraries will
be used ; or, if not present, the system will revert to the built-in ones.
- If a built-in library to be used is not present, the option(s) depending
on it will be disabled.
It also cleans up the flags and moves some things around to be more
explicit, as well as removing some unused/undefined ones.

I would really like to see the first patch merged into CVS, which would
prepare things for the second one. Having those two included before the
next release is clearly my target, so I would only have the libwww one
left to work on.
Of course, I will be happy to help if you have any issue with them, so
please don't hesitate to ask me or point to anything wrong or that doesn't
work.

Mainly as a test, I tried to start porting things to use automake instead
of hand-made Makefile.in's. This, together with a cleanup of the various
flags and options would make the whole build system much easier to deal
with. I will keep you informed with my progress on this side, if you're
interested.

Thanks,

Regis