diff -Naur Amaya/Options.in Amaya.new/Options.in --- Amaya/Options.in Mon Oct 14 15:29:01 2002 +++ Amaya.new/Options.in Tue Jan 14 13:03:23 2003 @@ -9,8 +9,8 @@ SHELL = /bin/sh 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/AHTURLTools.c Amaya.new/amaya/AHTURLTools.c --- Amaya/amaya/AHTURLTools.c Thu Dec 12 12:32:37 2002 +++ Amaya.new/amaya/AHTURLTools.c Tue Jan 14 13:01:30 2003 @@ -1,6 +1,6 @@ /* * - * (c) COPYRIGHT MIT and INRIA, 1996-2002 + * (c) COPYRIGHT INRIA and W3C, 1996-2003 * Please first read the full copyright statement in file COPYRIGHT. * */ @@ -21,6 +21,7 @@ #include "init_f.h" #include "AHTURLTools_f.h" #include "query_f.h" +#include "stdint.h" #define MAX_PRINT_URL_LENGTH 50 typedef struct _HTURI @@ -37,8 +38,11 @@ #define stat _stat #define uint64_t unsigned __int64 #define getpid _getpid -#else +#else /* _WINDOWS */ #define TMPDIR "TMPDIR" +#if HAVE_STDINT_H +#include +#endif /* HAVE_STDINT_H */ #endif /* _WINDOWS */ /*---------------------------------------------------------------------- @@ -2423,17 +2427,18 @@ { #ifdef JOSE - static char tmpbufmem[FILENAME_MAX]; + static char tmpbufmem[PATH_MAX + 1]; int len; int i; if (!dir || *dir == EOS || !TtaDirExists (dir)) return NULL; - /* make sure that the name is no bigger than FILENAME_MAX */ + /* make sure that the name is no bigger than PATH_MAX + the 6 tempname chars we + will add */ len = strlen (dir); - if (len + L_tmpnam > FILENAME_MAX) + if (len + 6 > PATH_MAX) return NULL; /* copy the dir name, and add a DIR_SEP if it's missing */ @@ -2445,7 +2450,7 @@ len++; } - /* copy the prefix (no more than L_tmpnam chars, to respect posix). Save + /* copy the prefix (no more than L_tmpnam chars, to respect POSIX). Save space for the 6 X and EOS chars that will become the random bits */ if (prefix) { diff -Naur Amaya/amaya/Makefile.libwww Amaya.new/amaya/Makefile.libwww --- Amaya/amaya/Makefile.libwww Fri Oct 4 16:33:12 2002 +++ Amaya.new/amaya/Makefile.libwww Tue Jan 14 13:01:30 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.new/configure --- Amaya/configure Thu Dec 12 12:32:36 2002 +++ Amaya.new/configure Tue Jan 14 13:02:50 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 @@ -6409,7 +6409,7 @@ egrep "x 62 *x" >/dev/null 2>&1; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - LIBJPEG='-ljpeg' + LIBJPEG='' MAKEJPEG='#' else rm -rf conftest* @@ -6430,7 +6430,7 @@ egrep "x \"1.[02]\..*\" *x" >/dev/null 2>&1; then rm -rf conftest* echo "$ac_t""yes" 1>&6 - LIBPNG='-lpng' + LIBPNG='' LIBZ='' MAKEPNG='#' else @@ -6557,6 +6557,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" @@ -6577,6 +6578,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.new/libraptor/configure --- Amaya/libraptor/configure Mon Oct 14 15:29:13 2002 +++ Amaya.new/libraptor/configure Tue Jan 14 13:01:30 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.new/configure --- libwww/configure Mon Jun 17 08:46:40 2002 +++ libwww.new/configure Tue Jan 14 13:01:30 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