diff -Nurd -x'*~' wwwblast.orig/Src/Makefile wwwblast/Src/Makefile --- wwwblast.orig/Src/Makefile 2003-11-21 16:10:56.000000000 -0500 +++ wwwblast/Src/Makefile 2006-03-30 02:13:58.000000000 -0500 @@ -1,12 +1,12 @@ # Set the NCBI variable to your local path to the NCBI toolkit! #NCBI = -NCBI_INCDIR = $(NCBI)/include -NCBI_ALTLIB = $(NCBI)/altlib -NCBI_LIBDIR = $(NCBI)/lib +#NCBI_INCDIR = $(NCBI)/include +#NCBI_ALTLIB = $(NCBI)/altlib +#NCBI_LIBDIR = $(NCBI)/lib -NCBI_OTHERLIBS = -lm -THREAD_LIBS = -lpthread +#NCBI_OTHERLIBS = -lm +#THREAD_LIBS = -lpthread # Uncomment the line(s) relevant to your platform below: @@ -15,8 +15,8 @@ # Solaris Sparc #NCBI_OTHERLIBS += -lposix4 -lresolv -lsocket -lrpcsvc -lnsl # MacOS -#NCBI_OTHERLIBS = -lc -#THREAD_LIBS = +NCBI_OTHERLIBS = -lc +THREAD_LIBS = # CC=cc @@ -46,15 +46,15 @@ LIBS = $(NCBI_LIBDIR) DEBUG_FLAG = -O # For MacOS, use the following line: -#DEBUG_FLAG = -O2 -g +DEBUG_FLAG = -O2 -g -OBJ_FILES = wwwbutl.c $(LIBS)/ncbithr.o +OBJ_FILES = wwwbutl.c $(LIBS)/ncbithr.o txalign.o xmlblast.o salogif.o # Defines: # NCBI_CLIENT_SERVER - full NCBI Client/server including BLAST search # NCBI_ENTREZ_CLIENT - Client server for gi/accession lookups -INCDIR = -I. -I$(NCBI_INCDIR) +INCDIR = -I. -I../../../api -I../../../tools -I../../../desktop -I$(NCBI_INCDIR) # Additional include path for internal NCBI BLAST 2 sequences only. # Comment out for standalone @@ -63,17 +63,17 @@ CFLAGS = -c $(DEBUG_FLAG) $(INCDIR) #For MacOS, add the following line: -#CFLAGS += -no-cpp-precomp -Wno-long-double +CFLAGS += -no-cpp-precomp -Wno-long-double # For standalone model LDFLAGS = $(DEBUG_FLAG) $(INCDIR) #For MacOS, add the following line: -#LDFLAGS += -framework CoreServices +LDFLAGS += -framework CoreServices # Use client/server for gi/accession lookups LDFLAGS_CS = $(DEBUG_FLAG) $(INCDIR) -DNCBI_ENTREZ_CLIENT #For MacOS, add the following line: -#LDFLAGS_CS += -framework CoreServices +LDFLAGS_CS += -framework CoreServices # For full NCBI Client-server model #CFLAGS += -DNCBI_CLIENT_SERVER diff -Nurd -x'*~' wwwblast.orig/Src/viewgif.c wwwblast/Src/viewgif.c --- wwwblast.orig/Src/viewgif.c 2003-07-15 13:42:19.000000000 -0400 +++ wwwblast/Src/viewgif.c 2006-03-30 02:17:38.000000000 -0500 @@ -1,6 +1,8 @@ #include #include #include +#include +#include static void SigAlrmHandler(int); static void SigTermHandler(int); diff -Nurd -x'*~' wwwblast.orig/index.html wwwblast/index.html --- wwwblast.orig/index.html 2002-08-06 15:03:51.000000000 -0400 +++ wwwblast/index.html 2006-03-30 01:59:16.000000000 -0500 @@ -9,20 +9,15 @@