? WX
? amaya_cleanup1.diff
? autom4te.cache
? debian
? amaya/HTML.STR
? amaya/HTMLP.PRS
? amaya/HTMLPBW.PRS
? amaya/HTMLPL.PRS
? amaya/HTMLPLL.PRS
? amaya/HTMLPLP.PRS
? amaya/HTMLPLPUS.PRS
? amaya/HTMLPP.PRS
? amaya/HTMLPPUS.PRS
? amaya/HTMLT.TRA
? amaya/HTMLT11.TRA
? amaya/HTMLTT.TRA
? amaya/HTMLTX.TRA
? amaya/HTMLUSL.PRS
? amaya/HTMLUSLL.PRS
? amaya/MathML.STR
? amaya/MathMLP.PRS
? amaya/MathMLT.TRA
? amaya/MathMLTX.TRA
? amaya/SVG.STR
? amaya/SVGP.PRS
? amaya/SVGT.TRA
? amaya/SVGTX.TRA
? amaya/Template.STR
? amaya/TemplateP.PRS
? amaya/TemplateT.TRA
? amaya/TemplateTX.TRA
? amaya/TextFile.STR
? amaya/TextFileP.PRS
? amaya/TextFilePL.PRS
? amaya/TextFilePP.PRS
? amaya/TextFilePPUS.PRS
? amaya/TextFileT.TRA
? amaya/TextFileUSL.PRS
? amaya/Timeline.STR
? amaya/TimelineP.PRS
? amaya/TimelineT.TRA
? amaya/TimelineTX.TRA
? amaya/XLink.STR
? amaya/XLinkP.PRS
? amaya/XLinkT.TRA
? amaya/XML.STR
? amaya/XMLP.PRS
? amaya/XMLPL.PRS
? amaya/XMLPP.PRS
? amaya/XMLPPUS.PRS
? amaya/XMLT.TRA
? amaya/XMLUSL.PRS
? annotlib/Annot.SCH
? annotlib/Annot.STR
? annotlib/Annot.h
? annotlib/AnnotAPP.c
? annotlib/AnnotP.PRS
? annotlib/AnnotT.TRA
? annotlib/Annotactions.proto
? annotlib/Topics.SCH
? annotlib/Topics.STR
? annotlib/Topics.h
? annotlib/TopicsAPP.c
? annotlib/TopicsP.PRS
? annotlib/Topicsactions.proto
? batch/APP.h
? batch/PRESEN.h
? batch/STRUCT.h
? batch/TRANS.h
Index: Options.in
===================================================================
RCS file: /sources/public/Amaya/Options.in,v
retrieving revision 1.46
diff -u -r1.46 Options.in
--- Options.in	31 Aug 2006 09:24:23 -0000	1.46
+++ Options.in	14 Oct 2006 19:14:28 -0000
@@ -34,7 +34,6 @@
 
 THOT_OPTIONS=@THOT_OPTIONS@
 AMAYA_OPTIONS=@AMAYA_OPTIONS@
-PLUGIN_OPTIONS=@PLUGIN_OPTIONS@
 AMAYA_ANNOT_OPTIONS=@AMAYA_ANNOT_OPTIONS@
 AMAYA_ANNOT_INCLUDES=@AMAYA_ANNOT_INCLUDES@
 AMAYA_ANNOT_EXTRA_LIBS=@AMAYA_ANNOT_EXTRA_LIBS@
Index: configure.in
===================================================================
RCS file: /sources/public/Amaya/configure.in,v
retrieving revision 1.207
diff -u -r1.207 configure.in
--- configure.in	3 Oct 2006 14:01:30 -0000	1.207
+++ configure.in	14 Oct 2006 19:14:29 -0000
@@ -223,7 +223,7 @@
 
 # check if gtk gui should be used
 AC_ARG_WITH(gtk, [  --with-gtk              use GTK GUI toolkit ])
-if test "$with_gtk" = "yes" -o "$enable_gtk" = "yes" ; then
+if test "$with_gtk" = "yes" ; then
   if test "$withval" = "no" ; then
     with_gtk="no"
     with_wx="yes"
@@ -235,7 +235,7 @@
 
 # check if wxWidgets gui should be used
 AC_ARG_WITH(wx, [  --with-wx               use wxWidgets GUI toolkit])
-if test "$with_wx" = "yes" -o "$enable_wx" = "yes" ; then
+if test "$with_wx" = "yes" ; then
   if test "$withval" = "no" ; then
     with_wx="no"
   else
@@ -253,12 +253,7 @@
 # check for mesa library (OpenGL)
 AC_ARG_WITH(MESA,              [  --with-mesa         enable canvas with software OpenGL implementation (Mesa) ])
 if test "$with_mesa" = "" ; then
- if test "$enable_mesa" = "yes" ; then
-    with_mesa="yes"
-    with_gl="no"
-  else
-    with_mesa="no"
-  fi
+  with_mesa="no"
 fi
 
 
@@ -1027,126 +1022,98 @@
 AC_SUBST(NOPRINT)
 
 
-AC_ARG_ENABLE(svg,           [  --disable-svg           remove SVG support ])
-AC_ARG_ENABLE(annot,         [  --disable-annot         remove Annotations support ])
-AC_ARG_ENABLE(redland,       [  --disable-redland       disable the redland RDF library ])
-AC_ARG_ENABLE(system-redland,       [  --enable-system-redland try the redland RDF system library ])
-AC_ARG_ENABLE(bookmarks,     [  --enable-bookmarks      enables experimental bookmark support ])
-AC_ARG_ENABLE(templates,     [  --disable-templates     disables experimental templates support ])
-AC_ARG_ENABLE(generic-xml,   [  --disable-generic-xml   remove Generic XML support ])
-
-dnl
-dnl plugins support is disabled by default
-dnl
-
-if test "$with_plugin" = "" ; then
-  if test "$enable_plugin" = "yes" ; then
-    with_plugin="yes"
-  else
-    with_plugin="no"
-  fi
-fi  
-
 dnl
 dnl svg is enabled by default
 dnl
-if test "$with_svg" = "" ; then
-    if test "$enable_svg" = "no" ; then
-	with_svg="no"
-    else
-	with_svg="yes"
-    fi
-fi
-
-dnl
-dnl annotations is enabled by default
-dnl
-if test "$with_annot" = "" ; then
-    if test "$enable_annot" = "no" ; then
-	with_annot="no"
-    else
-	with_annot="yes"
-    fi
-else
-    with_annot="yes"
-fi
-
+AC_ARG_ENABLE([svg],
+	AC_HELP_STRING([--disable-svg],[disable SVG support]),
+	[case "${enableval}" in
+	  yes) with_svg="yes" ;;
+	  no)  with_svg="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-svg) ;;
+	esac],
+	[with_svg="yes"])
+
+dnl
+dnl annotations are enabled by default
+dnl
+AC_ARG_ENABLE([annot],
+	AC_HELP_STRING([--disable-annot],[disable Annotations support]),
+	[case "${enableval}" in
+	  yes) with_annot="yes" ;;
+	  no)  with_annot="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-annot) ;;
+	esac],
+	[with_annot="yes"])
 
 dnl
 dnl The redland library is enabled by default
 dnl
-if test "$with_redland" = "" ; then
-    if test "$enable_redland" = "no" ; then
-	with_redland="no"
-    else
-	with_redland="yes"
-    fi
-else
-    with_redland="yes"
-fi
-
-dnl
-dnl The redland library is disabled by default
-dnl
-if test "$with_system_redland" = "" ; then
-    if test "$enable_system_redland" = "yes" ; then
-	with_redland="yes"
-	with_system_redland="yes"
-    else
-	with_system_redland="no"
-    fi
-else
-    with_system_redland="no"
-fi
+AC_ARG_ENABLE([redland],
+	AC_HELP_STRING([--disable-redland],[disable redland RDF support]),
+	[case "${enableval}" in
+	  yes) with_redland="yes" ;;
+	  no)  with_redland="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-redland) ;;
+	esac],
+	[with_redland="yes"])
 
 dnl
 dnl The bookmarks support is disabled by default
 dnl
-if test "$with_bookmarks" = "" ; then
-    if test "$enable_bookmarks" = "yes" ; then
-	with_bookmarks="yes"
-	with_redland="yes"
-    else
-	with_bookmarks="no"
-    fi
-else
-    with_bookmarks="no"
-fi
+AC_ARG_ENABLE([bookmarks],
+	AC_HELP_STRING([--enable-bookmarks],[enable experimental bookmark support]),
+	[case "${enableval}" in
+	  yes) with_bookmarks="yes"; with_redland="yes" ;;
+	  no)  with_bookmarks="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --enable-bookmarks) ;;
+	esac],
+	[with_bookmarks="no"])
 
 dnl
 dnl The templates support is enabled by default
 dnl
-if test "$with_templates" = "no " -o "$enable_templates" = "no"; then
-      with_templates="no"
-else
-  if test "$with_wx" = "no"; then
-      AC_MSG_WARN(Templates are only available in WX version !!)
-      AC_MSG_WARN(Disabling templates)
-      with_templates="no"
-   else
-      with_templates="yes"
-   fi
-fi 
+AC_ARG_ENABLE([templates],
+	AC_HELP_STRING([--disable-templates],[disable experimental templates support]),
+	[case "${enableval}" in
+	  yes) with_templates="yes" ;;
+	  no)  with_templates="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-templates) ;;
+	esac],
+	[with_templates="yes"])
+
+if test "$with_templates" = yes -a "$with_wx" != "yes"; then
+    AC_MSG_WARN(Templates are only available in WX version !!)
+    AC_MSG_WARN(Disabling templates)
+    with_templates="no"
+fi
 
-if test "$with_templates" = "yes" -o "$with_templates" = "" ; then
+if test "$with_templates" = "yes" ; then
     TEMPLATES_OPTIONS="-DTEMPLATES"
 else
     TEMPLATES_OPTIONS=""
 fi
 
-
 dnl
 dnl Generic XML support enabled by default
 dnl
-if test "$with_generic_xml" = "" ; then
-    if test "$enable_generic_xml" = "no" ; then
-	    with_generic_xml="no"
-	    GENERIC_XML_OPTIONS=
-    else
-	    with_generic_xml="yes"
-	    GENERIC_XML_OPTIONS=-DXML_GENERIC
-    fi
-fi
+AC_ARG_ENABLE([generic-xml],
+	AC_HELP_STRING([--disable-generic-xml],[disable Generic XML support]),
+	[case "${enableval}" in
+	  yes) with_generic_xml="yes" ;;
+	  no)  with_generic_xml="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --disable-generic-xml) ;;
+	esac],
+	[with_generic_xml="yes"])
+
+AC_ARG_ENABLE([system-redland],
+	AC_HELP_STRING([--enable-system-redland],[try the redland RDF system library]),
+	[case "${enableval}" in
+	  yes) with_system_redland="yes"; with_redland="yes" ;;
+	  no)  with_system_redland="no" ;;
+	  *) AC_MSG_ERROR(bad value ${enableval} for --enable-system-redland) ;;
+	esac],
+	[with_system_redland="no"])
 
 dnl
 dnl WebDAV support enabled by default
@@ -1291,13 +1258,6 @@
     	ANNOTLIB_COMPILE_BM=['#']
     fi
 
-    if test "$with_plugin" = "yes" ; then
-        AC_MSG_WARN(The plugin library isn't supported anymore in Amaya !!)
-        AC_MSG_WARN(Disabling plugin build !)
-        with_plugin="no"
-    fi
-
-
     if test ! -f $srcdir/davlib/Makefile.in ; then
 	if test "$with_dav" = "yes" ; then
 	    AC_MSG_WARN(WebDAV makefile not found !!)
@@ -1323,7 +1283,6 @@
 else
   AMAYA_OPTIONS="$OS_OPTIONS $MATH_OPTIONS $SVG_OPTIONS $GENERIC_XML_OPTIONS $GTK_OPTIONS $GL_OPTIONS $WX_OPTIONS $NOGUI_OPTIONS $TEMPLATES_OPTIONS"
 fi
-#PLUGIN_OPTIONS="-DPLUGIN_TRACE -DXP_UNIX"
 AMAYA_ANNOT_OPTIONS="$OS_OPTIONS $AMAYA_ANNOT_OPTIONS"
 
 if test "$with_wx" = "yes" ; then
@@ -1409,7 +1368,6 @@
 AC_SUBST(GTK_OPTIONS)
 AC_SUBST(THOT_OPTIONS)
 AC_SUBST(AMAYA_OPTIONS)
-AC_SUBST(PLUGIN_OPTIONS)
 AC_SUBST(AMAYA_ANNOT_OPTIONS)
 AC_SUBST(AMAYA_ANNOT_INCLUDES)
 AC_SUBST(AMAYA_ANNOT_EXTRA_LIBS)
@@ -1437,14 +1395,6 @@
 dnl Include the option Makefile.xxx fragment according to the configure options
 dnl
 
-if test "$with_plugin" = "yes" ; then
-    AC_SUBST_FILE(plugin_frag)
-    plugin_frag=$srcdir/pluginlib/Makefile.plugin
-else
-    AC_SUBST_FILE(plugin_frag)
-    plugin_frag=/dev/null
-fi
-
     AC_SUBST_FILE(www_frag)
     www_frag=$srcdir/amaya/Makefile.libwww
 
@@ -1507,16 +1457,10 @@
 
 if test "$build_amaya" = "yes" ; then
 
-    make_output="$make_output amaya/Makefile pluginlib/Makefile"
+    make_output="$make_output amaya/Makefile"
     EXTRA_MAKEFILE_IN="$srcdir/amaya/Makefile.in \
     $srcdir/amaya/Makefile.libwww"
 
-    if test "$with_plugin" = "yes" ; then
-       make_output="$make_output pluginlib/Makefile"
-       EXTRA_MAKEFILE_IN="$srcdir/pluginlib/Makefile.in \
-       $srcdir/pluginlib/Makefile.plugin"
-    fi
-
     if test "$with_annot" = "yes" ; then
        make_output="$make_output annotlib/Makefile"
        EXTRA_MAKEFILE_IN="$srcdir/annotlib/Makefile.in"
@@ -1573,9 +1517,6 @@
 if test "$build_amaya" = "yes" ; then
     echo Amaya $AMAYA_VER configured
     echo Amaya configured with libWWW
-    if test "$with_plugin" = "yes" ; then
-        echo Amaya configured with Plugins support
-    fi
     if test "$with_math" = "yes" ; then
 	echo Amaya configured with Math support
     fi
Index: amaya/Makefile.in
===================================================================
RCS file: /sources/public/Amaya/amaya/Makefile.in,v
retrieving revision 1.193
diff -u -r1.193 Makefile.in
--- amaya/Makefile.in	23 Jun 2006 10:15:23 -0000	1.193
+++ amaya/Makefile.in	14 Oct 2006 19:14:29 -0000
@@ -15,7 +15,7 @@
 include ../Options
 
 INCLUDES= -DHAVE_CONFIG_H $(AMAYA_INCLUDES) $(EXPAT_INCLUDES) $(GUI_INCLUDES) $(EXTRA_INCLUDES) $(GL_INCLUDES) $(GTK_GL_INCLUDES) $(FREETYPE_INCLUDES) $(XFT_INCLUDES)
-LIBS	=  $(AMAYA_PLUGIN_LIBS) $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \
+LIBS	=  $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) \
 	   @AMAYA_RAPTOR_LIBS@ \
 	   $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
            -L../thotlib -L.. -lThotEditor \
@@ -30,7 +30,6 @@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
 bindir = @bindir@
-comp_plugin: $(amaya_comp_plugin)
 comp_annot: $(amaya_comp_annot)
 
 #
@@ -104,9 +103,6 @@
 #									#
 #########################################################################
 
-#include the fragment "pluginlib/Makefile.plugin" for plugins if configured in
-@plugin_frag@
-
 #include the fragment "amaya/Makefile.libwww" for libwww if configured in
 @www_frag@
 
@@ -134,34 +130,34 @@
 #########################################################################
 
 ALL_AMAYA_OPTIONS= $(AMAYA_OPTIONS) \
-	 $(AMAYA_PLUGIN_OPTIONS) $(AMAYA_LIBWWW_OPTIONS) \
+	 $(AMAYA_LIBWWW_OPTIONS) \
 	 $(AMAYA_MATH_OPTIONS) $(AMAYA_SVG_OPTIONS)  $(AMAYA_TEMPLATES_OPTIONS) \
 	 $(AMAYA_ANNOT_OPTIONS) $(AMAYA_DAV_OPTIONS) $(EXPAT_OPTIONS) \
 
-AMAYA_OPTION_INCLUDES= $(AMAYA_PLUGIN_INCLUDES) \
+AMAYA_OPTION_INCLUDES= \
          $(AMAYA_LIBWWW_INCLUDES) $(AMAYA_MATH_INCLUDES) \
 	 $(AMAYA_SVG_INCLUDES) $(AMAYA_ANNOT_INCLUDES) \
 	 $(AMAYA_DAV_INCLUDES) $(AMAYA_TEMPLATES_INCLUDES)
 
-AMAYA_OPTION_OBJ= $(AMAYA_PLUGIN_OBJ) \
+AMAYA_OPTION_OBJ= \
          $(AMAYA_LIBWWW_OBJ) $(AMAYA_SVG_OBJ) $(AMAYA_MATH_OBJ) \
          $(AMAYA_ANNOT_OBJ) $(AMAYA_DAV_OBJ) $(AMAYA_TEMPLATES_OBJ)
 
-AMAYA_SRC= $(AMAYA_PLUGIN_SRC) \
+AMAYA_SRC= \
          $(AMAYA_LIBWWW_SRC) @AMAYA_RAPTOR_SRC@ \
 	 $(AMAYA_MATH_SRC) $(AMAYA_SVG_SRC) \
          $(AMAYA_ANNOT_SRC) $(AMAYA_DAV_SRC) $(AMAYA_TEMPLATES_SRC)
 
 
-AMAYA_OPTION_LIBS= $(AMAYA_PLUGIN_LIBS) \
+AMAYA_OPTION_LIBS= \
          $(AMAYA_LIBWWW_OPTION_LIBS) $(AMAYA_MATH_LIBS) $(AMAYA_GRAPH_LIBS) \
          $(AMAYA_ANNOT_LIBS) $(AMAYA_DAV_LIBS) @AMAYA_RAPTOR_LIBS@
 
-AMAYA_OPTION_EXTRA_LIBS= $(AMAYA_PLUGIN_EXTRA_LIBS) \
+AMAYA_OPTION_EXTRA_LIBS= \
          $(AMAYA_LIBWWW_EXTRA_LIBS) $(AMAYA_MATH_EXTRA_LIBS) \
          $(AMAYA_GRAPH_EXTRA_LIBS) $(AMAYA_ANNOT_EXTRA_LIBS)
 
-AMAYA_OPTION_SCHEMAS= $(AMAYA_PLUGIN_SCHEMAS) \
+AMAYA_OPTION_SCHEMAS= \
          $(AMAYA_LIBWWW_SCHEMAS) $(MATH_SCHEMAS) $(SVG_SCHEMAS) \
          $(ANNOT_SCHEMAS) $(TEMPLATES_SCHEMAS)
 
Index: annotlib/AHTrdf2annot.c
===================================================================
RCS file: /sources/public/Amaya/annotlib/AHTrdf2annot.c,v
retrieving revision 1.62
diff -u -r1.62 AHTrdf2annot.c
--- annotlib/AHTrdf2annot.c	21 Mar 2006 17:29:43 -0000	1.62
+++ annotlib/AHTrdf2annot.c	14 Oct 2006 19:14:30 -0000
@@ -32,7 +32,6 @@
 #include "ANNOTtools_f.h"
 
 /* RDF parser */
-#include "redland.h"
 #include "raptor.h"
 
 /* Amaya includes */
Index: annotlib/ANNOTevent.c
===================================================================
RCS file: /sources/public/Amaya/annotlib/ANNOTevent.c,v
retrieving revision 1.174
diff -u -r1.174 ANNOTevent.c
--- annotlib/ANNOTevent.c	21 Mar 2006 17:29:43 -0000	1.174
+++ annotlib/ANNOTevent.c	14 Oct 2006 19:14:30 -0000
@@ -47,7 +47,6 @@
 /* RDF parser */
 #ifdef AM_REDLAND
 #ifndef BOOKMARKS
-#include "redland.h"
 #include "raptor.h"
 #endif /* BOOKMARKS */
 #endif /* AM_REDLAND */
Index: annotlib/ANNOTschemas.c
===================================================================
RCS file: /sources/public/Amaya/annotlib/ANNOTschemas.c,v
retrieving revision 1.38
diff -u -r1.38 ANNOTschemas.c
--- annotlib/ANNOTschemas.c	21 Mar 2006 17:29:43 -0000	1.38
+++ annotlib/ANNOTschemas.c	14 Oct 2006 19:14:31 -0000
@@ -39,7 +39,6 @@
 #include "ANNOTevent_f.h"
 
 /* RDF parser */
-#include "redland.h"
 #include "raptor.h"
 
 /* amaya includes */