--- metapixel-0.7/Makefile	Fri Jan 21 14:32:17 2000
+++ metapixel-0.7-patched/Makefile	Mon May 13 02:39:51 2002
@@ -8,7 +8,7 @@
 #PROFILE = -pg
 
 LDOPTS = -L/usr/X11R6/lib $(PROFILE)
-CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall -O9 $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
+CCOPTS = -I/usr/X11R6/include -I/usr/X11R6/include/X11 -Wall $(PROFILE) -DMETAPIXEL_VERSION=\"$(VERSION)\"
 CC = gcc
 #LIBFFM = -lffm
 
@@ -17,10 +17,10 @@
 all : metapixel
 
 metapixel : $(OBJS) libzoom/libzoom.a
-	$(CC) $(LDOPTS) -o metapixel $(OBJS) libzoom/libzoom.a -lpng -ljpeg $(LIBFFM) -lm -lz
+	$(CC) $(LDFLAGS) $(LDOPTS) -o metapixel $(OBJS) libzoom/libzoom.a -lpng -ljpeg $(LIBFFM) -lm -lz
 
 %.o : %.c
-	$(CC) $(CCOPTS) -c $<
+	$(CC) $(CFLAGS) $(CCOPTS) -c $<
 
 libzoom/libzoom.a :
 	$(MAKE) -C libzoom libzoom.a
--- metapixel-0.7/getopt.c	Fri Jan 21 14:32:17 2000
+++ metapixel-0.7-patched/getopt.c	Mon May 13 02:51:31 2002
@@ -62,6 +62,10 @@
 #endif
 #endif	/* GNU C library.  */
 
+#ifdef __APPLE__
+#include <unistd.h>
+#endif
+
 #ifdef VMS
 #include <unixlib.h>
 #if HAVE_STRING_H - 0
@@ -190,6 +194,10 @@
 #include <string.h>
 #define	my_index	strchr
 #else
+
+#ifdef __APPLE__
+#include <string.h>
+#endif
 
 /* Avoid depending on library functions or files
    whose names are inconsistent.  */
--- metapixel-0.7/libzoom/zoom.c	Fri Jan 21 14:32:17 2000
+++ metapixel-0.7-patched/libzoom/zoom.c	Mon May 13 02:46:51 2002
@@ -50,6 +50,7 @@
 static char rcsid[] = "$Header: /mnt/homes/cvsroot/metapixel/metapixel/libzoom/zoom.c,v 1.1 2000/01/04 03:35:21 schani Exp $";
 
 #include <math.h>
+#include <limits.h>
 
 #include "simple.h"
 #include "pic.h"
@@ -769,7 +770,7 @@
 	/* evaluate the filter function: */
 	tr = sc*filt_func(filter, (i+.5-cen)/ap->scale);
 
-	if (tr<MINSHORT || tr>MAXSHORT) {
+	if (tr<SHRT_MIN || tr>SHRT_MAX) {
 	    fprintf(stderr, "tr=%g at %d\n", tr, b);
 	    exit(1);
 	}
--- metapixel-0.7/libzoom/simple.h	Fri Jan 21 14:32:17 2000
+++ metapixel-0.7-patched/libzoom/simple.h	Mon May 13 02:43:11 2002
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <values.h>
+//#include <values.h>
 #include <math.h>
 
 #define str_eq(a, b)    (strcmp(a, b) == 0)