|
Line
Link Here
|
| 0 |
-- amaya-9.4.orig/Amaya/annotlib/AHTrdf2annot.c |
0 |
++ amaya-9.4/Amaya/annotlib/AHTrdf2annot.c |
|
Lines 32-38
Link Here
|
| 32 |
#include "ANNOTtools_f.h" |
32 |
#include "ANNOTtools_f.h" |
| 33 |
|
33 |
|
| 34 |
/* RDF parser */ |
34 |
/* RDF parser */ |
| 35 |
#include "librdf.h" |
35 |
#include "redland.h" |
| 36 |
#include "raptor.h" |
36 |
#include "raptor.h" |
| 37 |
|
37 |
|
| 38 |
/* Amaya includes */ |
38 |
/* Amaya includes */ |
| 39 |
-- amaya-9.4.orig/Amaya/annotlib/ANNOTevent.c |
39 |
++ amaya-9.4/Amaya/annotlib/ANNOTevent.c |
|
Lines 47-53
Link Here
|
| 47 |
/* RDF parser */ |
47 |
/* RDF parser */ |
| 48 |
#ifdef AM_REDLAND |
48 |
#ifdef AM_REDLAND |
| 49 |
#ifndef BOOKMARKS |
49 |
#ifndef BOOKMARKS |
| 50 |
#include "librdf.h" |
50 |
#include "redland.h" |
| 51 |
#include "raptor.h" |
51 |
#include "raptor.h" |
| 52 |
#endif /* BOOKMARKS */ |
52 |
#endif /* BOOKMARKS */ |
| 53 |
#endif /* AM_REDLAND */ |
53 |
#endif /* AM_REDLAND */ |
| 54 |
-- amaya-9.4.orig/Amaya/annotlib/ANNOTschemas.c |
54 |
++ amaya-9.4/Amaya/annotlib/ANNOTschemas.c |
|
Lines 39-45
Link Here
|
| 39 |
#include "ANNOTevent_f.h" |
39 |
#include "ANNOTevent_f.h" |
| 40 |
|
40 |
|
| 41 |
/* RDF parser */ |
41 |
/* RDF parser */ |
| 42 |
#include "librdf.h" |
42 |
#include "redland.h" |
| 43 |
#include "raptor.h" |
43 |
#include "raptor.h" |
| 44 |
|
44 |
|
| 45 |
/* amaya includes */ |
45 |
/* amaya includes */ |
| 46 |
-- amaya-9.4.orig/Amaya/Makefile.in |
46 |
++ amaya-9.4/Amaya/Makefile.in |
|
Lines 368-373
Link Here
|
| 368 |
--disable-shared \ |
368 |
--disable-shared \ |
| 369 |
--without-bdb \ |
369 |
--without-bdb \ |
| 370 |
--enable-parsers=raptor \ |
370 |
--enable-parsers=raptor \ |
|
|
371 |
--with-raptor=internal \ |
| 371 |
--with-xml-parser=expat \ |
372 |
--with-xml-parser=expat \ |
| 372 |
--with-www=none \ |
373 |
--with-www=none \ |
| 373 |
--without-libwww \ |
374 |
--without-libwww \ |
| 374 |
-- amaya-9.4.orig/Amaya/configure.in |
375 |
++ amaya-9.4/Amaya/configure.in |
|
Lines 1231-1237
Link Here
|
| 1231 |
fi |
1231 |
fi |
| 1232 |
|
1232 |
|
| 1233 |
if test "$with_redland" = "yes" ; then |
1233 |
if test "$with_redland" = "yes" ; then |
| 1234 |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DLIBRDF_INTERNAL=1 -DAM_REDLAND -DRAPTOR_RDF_PARSER" |
1234 |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -DAM_REDLAND -DRAPTOR_RDF_PARSER" |
| 1235 |
if test "$redland_compile_source" = "yes" ; then |
1235 |
if test "$redland_compile_source" = "yes" ; then |
| 1236 |
AMAYA_RAPTOR_SRC="amaya_comp_redland" |
1236 |
AMAYA_RAPTOR_SRC="amaya_comp_redland" |
| 1237 |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor" |
1237 |
AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor" |
