Index: Amaya/configure.in
===================================================================
--- Amaya.orig/configure.in	2006-11-12 23:22:55.550627750 +0000
+++ Amaya/configure.in	2006-11-12 23:27:10.322550000 +0000
@@ -1120,7 +1120,7 @@
 	if test "$with_system_redland" != "yes" ; then
 		AMAYA_RAPTOR_SRC="amaya_comp_redland"
 		AMAYA_ANNOT_OPTIONS="$AMAYA_ANNOT_OPTIONS -I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
-		AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a ../redland/raptor/.libs/libraptor.a"
+		AMAYA_RAPTOR_LIBS="../redland/librdf/.libs/librdf.a"
 		AMAYA_RAPTOR_INCLUDES="-I\$(THOTDIR)/../redland/librdf -I\$(THOTDIR)/../redland/raptor"
 	else
 		MAKEREDLAND=['#']
@@ -1359,7 +1359,6 @@
 AC_SUBST(WITHDAV)
 AC_SUBST(WWWDAV)
 
-AC_SUBST(MAKERAPTOR)
 AC_SUBST(MAKEREDLAND)
 AC_SUBST(ANNOTLIB_COMPILE_BM)
 AC_SUBST(AMAYA_RAPTOR_SRC)
Index: Amaya/Makefile.in
===================================================================
--- Amaya.orig/Makefile.in	2006-11-12 23:06:20.756457000 +0000
+++ Amaya/Makefile.in	2006-11-12 23:27:10.326550250 +0000
@@ -12,14 +12,13 @@
 include Options
 
 LIBWWW	   = libwww
-LIBRAPTOR  = libraptor
 REDLAND    = redland
 LIBJPEG	   = libjpeg
 LIBPNG	   = libpng
 
 #MKP: adding davlib
 SUBDIRS	= @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@
-EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
+EXTRA_SUBDIRS= misc pluginlib $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -294,51 +293,6 @@
 		@($(ECHO) "libwww is installed")
 
 #
-# Rules to build the raptor RDF package
-#
-
-libraptor_config: @MAKERAPTOR@ force
-	@(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)" ] ; then \
-	      $(ECHO) "Error raptor dir not found at $(THOTDIR)/$(LIBRAPTOR)" ; \
-	  fi)
-	@(if [ ! -e "$(THOTDIR)/$(LIBRAPTOR)/expat" ] ; then \
-	      libwwwdir="$(THOTDIR)/../$(LIBWWW)" ; \
-	      echo $$libwwwdir ; \
-	      $(LN_S) "$$libwwwdir/modules/expat" "$(THOTDIR)/$(LIBRAPTOR)/expat" ; \
-	  fi)
-	 @(if [ ! -d "$(LIBRAPTOR)" ] ; then \
-		$(MKDIR) $(LIBRAPTOR) ; \
-          fi)
-	 @(localdir=`pwd` ; raptordir="$$localdir/../$(LIBRAPTOR)" ; \
-	  cd $(LIBRAPTOR) ; unset LANG; \
-	  if [ ! -f Makefile -o ! -f config.h ] ; then \
-	  	CFLAGS="-I$$raptordir/expat/lib" \
-			$$raptordir/configure \
-			--build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \
-			--without-shared \
-			--with-expat ; \
-		$(ECHO) "patching libraptor/libtool because -flat_namespace option is missing and do not compile on macosx" ; \
-		$(CP) libtool libtool.orig ; \
-		$(SED) "s/\(allow_undefined_flag=\"-undefined suppress\)/\1 -flat_namespace/" \
-			libtool.orig > libtool ; \
-		$(ECHO) "libraptor/libtool patched !" ; \
-		$(ECHO) "libraptor is configured" ; \
-	  fi)
-
-libraptor_make: @MAKERAPTOR@ force
-	@(localdir=`pwd`; \
-	  cd $(LIBRAPTOR) ; \
-	  if [ ! -e .libs/libraptor.a -a -e libraptor.la ] ; then \
-             $(RM) libraptor.la ; \
-          fi ; \
-	  $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -I$$localdir/../$(LIBRAPTOR)/expat/lib " \
-		  CPPFLAGS="$(CPPFLAGS)" \
-	)
-
-libraptor: @MAKERAPTOR@ libraptor_config libraptor_make
-	@($(ECHO) "libraptor is installed")
-
-#
 # Rules to build the redland RDF library
 #