diff -Naur Amaya/Options.in Amaya-patched/Options.in
--- Amaya/Options.in	Mon Oct 14 10:29:01 2002
+++ Amaya-patched/Options.in	Wed Mar  5 18:12:11 2003
@@ -10,7 +10,7 @@
 
 CC	= @CC@
 CFLAGS	= @CFLAGS@
-CPP     = @CPP@
+CPP     = @CPP@ -no-cpp-precomp
 LD	= @CC@
 LDFLAGS	= @LDFLAGS@
 CP	= @CP@
@@ -35,7 +35,7 @@
 PLUGIN_OPTIONS=@PLUGIN_OPTIONS@
 AMAYA_ANNOT_OPTIONS=@AMAYA_ANNOT_OPTIONS@
 
-IMGLIBS=@IMGLIBS@
+IMGLIBS=@IMGLIBS@ -lpng -ljpeg -lz
 EXTRA_LIBS=@EXTRA_LIBS@
 
 MOTIF_INCLUDES=@MOTIF_INCLUDES@
@@ -45,11 +45,11 @@
 EXPAT_LIBRARIES=
 EXPAT_OPTIONS=-DXML_DTD -DXML_NS
 
-GTK_INCLUDES=@GTK_INCLUDES@
+GTK_INCLUDES=@GTK_INCLUDES@ -I@FINK@/include
 GTK_LIBRARIES=@GTK_LIBRARIES@
 
 GL_INCLUDES=@GL_INCLUDES@
-GL_LIBRARIES=@GL_LIBRARIES@
+GL_LIBRARIES=-L/usr/X11R6/lib @GL_LIBRARIES@
 
 X_FLAGS=$(MOTIF_INCLUDES) $(GTK_INCLUDES) $(GL_INCLUDES) @X_CFLAGS@
 X_EXTRA_LIBS=@X_EXTRA_LIBS@
diff -Naur Amaya/amaya/Makefile.libwww Amaya-patched/amaya/Makefile.libwww
--- Amaya/amaya/Makefile.libwww	Fri Jan 31 10:15:31 2003
+++ Amaya-patched/amaya/Makefile.libwww	Wed Mar  5 18:12:11 2003
@@ -20,28 +20,25 @@
 
 #MKP: added -lwwwdav
 AMAYA_LIBWWW_LIBS= \
+		../$(LIBWWW)/Library/src/.libs/libwwwapp.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwhttp.a \
 		-L../$(LIBWWW)/Library/src/.libs \
-			-lwwwapp \
-			-lwwwhttp \
 			$(LIBWWW_RDF_PARSER) \
-			-lwwwhtml \
-			-lwwwmime \
-			-lwwwcache \
-			-lwwwstream \
-			-lwwwfile \
-			-lwwwdir \
-			-lwwwtrans \
-			-lwwwcore \
-			-lwwwutils \
-			-lwwwzip \
-			-lwwwftp \
-			$(WWWDAV) \
-		-L../$(LIBWWW)/modules/md5/.libs \
-			-lmd5 \
-		-L../$(LIBWWW)/modules/expat/xmlparse/.libs \
-			-lxmlparse \
-		-L../$(LIBWWW)/modules/expat/xmltok/.libs \
-			-lxmltok
+		../$(LIBWWW)/Library/src/.libs/libwwwhtml.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwmime.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwcache.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwstream.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwfile.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwdir.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwtrans.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwcore.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwutils.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwzip.a \
+		../$(LIBWWW)/Library/src/.libs/libwwwftp.a \
+		$(WWWDAV) \
+		../$(LIBWWW)/modules/md5/.libs/libmd5.a \
+		../$(LIBWWW)/modules/expat/xmlparse/.libs/libxmlparse.a \
+		../$(LIBWWW)/modules/expat/xmltok/.libs/libxmltok.a
 
 AMAYA_LIBWWW_EXTRA_LIBS=
 
diff -Naur Amaya/configure Amaya-patched/configure
--- Amaya/configure	Mon Feb  3 09:43:57 2003
+++ Amaya-patched/configure	Wed Mar  5 18:14:21 2003
@@ -3528,7 +3528,7 @@
 fi
 done
 
-for ac_hdr in appkit/appkit.h appkit.h
+for ac_hdr in apppkit/appkit.h apppkit.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -6454,7 +6454,7 @@
   rm -rf conftest*
           echo "$ac_t""yes" 1>&6
 	JPEGINCL=''
-        LIBJPEG='-ljpeg'
+        LIBJPEG=''
         MAKEJPEG='#'
 else
   rm -rf conftest*
@@ -6477,7 +6477,7 @@
   rm -rf conftest*
           echo "$ac_t""yes" 1>&6
 	PNGINCL=''
-        LIBPNG='-lpng'
+        LIBPNG=''
         LIBZ=''
 	MAKEPNG='#'
 else
@@ -6607,6 +6607,7 @@
 		/usr/X11R6/include 		\
 		/usr/local/include		\
 		/usr/local/include/GL		\
+		@FINK@/include			\
 		; \
 	do  if test -r "$ac_dir/gtkgl/gtkglarea.h" ; then
                 gtkgl_inc="yes"
@@ -6627,6 +6628,7 @@
 		/usr/include 			\
 		/usr/X11R6/include 		\
 		/usr/local/include		\
+		@FINK@/include/freetype2		\
 		; \
 	do  if test -r "$ac_dir/ft2build.h" ; then
                 freetype_inc="yes"
diff -Naur Amaya/libraptor/configure Amaya-patched/libraptor/configure
--- Amaya/libraptor/configure	Mon Oct 14 10:29:13 2002
+++ Amaya-patched/libraptor/configure	Wed Mar  5 18:12:11 2003
@@ -3682,7 +3682,7 @@
     ;;
 
   darwin* | rhapsody*)
-    allow_undefined_flag='-undefined suppress'
+    allow_undefined_flag='-flat_namespace -undefined suppress'
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
diff -Naur libwww/configure libwww-patched/configure
--- libwww/configure	Mon Jun 17 03:46:40 2002
+++ libwww-patched/configure	Wed Mar  5 18:12:11 2003
@@ -3256,7 +3256,7 @@
 fi
 
 
-for ac_hdr in appkit/appkit.h appkit.h
+for ac_hdr in apppkit/apppkit.h apppkit.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6