diff --git a/config.site b/config.site
index 95266b95..0650e2c3 100644
--- a/config.site
+++ b/config.site
@@ -1,4 +1,4 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.2 1999-09-26 22:03:46 mwelles Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.3 2001-03-30 01:55:32 warmerda Exp $
 #
 # TIFF Software
 #
@@ -132,6 +132,7 @@
 #CC="gcc"				# name/pathname of C compiler
 #ENVOPTS="-Aa"				# options for getting ANSI C
 #GCOPTS="-g"				# options to pass C compiler
+#OPTIMIZER="-O"				# Optimization options for compiler
 #LIBPORT='${PORT}/libport.a'		# library with emulation code
 #MACHDEPLIBS=""				# extra libraries for linking
 #PORTFUNCS=""				# non-standard functions to emulate
diff --git a/configure b/configure
index c3e52d54..fa1bd2d2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.10 2000-12-22 22:33:41 mwelles Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.11 2001-03-30 01:55:32 warmerda Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@@ -60,6 +60,7 @@ LIBIMAGE=auto				# auto-enable build of SGI -limage apps
 MACHDEPLIBS=-lm				# machine-dependent libraries for apps
 : ${CC=}				# name of C compiler to use
 : ${CCOMPILER=}				# full pathname of C compiler
+: ${OPTIMIZER=-O}			# Optimization flag
 : ${ENVOPTS=}				# CC opts for ANSI C compilation
 : ${MAKE=make}				# make to use
 
@@ -152,7 +153,7 @@ do
     -target|--target)		ac_prev=TARGET;;
     -target=*|--target=*)	TARGET="$ac_optarg" ;;
     -version|--version)
-	echo "This is TIFF configure $Revision: 1.10 $"
+	echo "This is TIFF configure $Revision: 1.11 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -1748,6 +1749,7 @@ s;@MANCVT@;${MANCVT};g
 s;@MANSEDLOCAL@;${MANSEDLOCAL};g
 s;@MANLIB@;${MANLIB};g
 s;@MV_F@;${MV_F};g
+s;@OPTIMIZER@;${OPTIMIZER};g
 s;@PORT@;${PORT};g
 s;@PORTFUNCS@;${PORTFUNCS};g
 s;@RANLIB@;${RANLIB};g
diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
index 493c9480..37a62a87 100644
--- a/libtiff/Makefile.in
+++ b/libtiff/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.8 2000-11-24 15:45:35 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/libtiff/Makefile.in,v 1.9 2001-03-30 01:55:32 warmerda Exp $
 #
 # Tag Image File Format Library
 #
@@ -62,7 +62,7 @@ IPATH	= -I. -I${SRCDIR} @COPT_LIBINC@
 #
 CONF_LIBRARY=@CONF_JPEG@ @CONF_ZIP@
 COPTS	= @GCOPTS@
-OPTIMIZER=-O
+OPTIMIZER=@OPTIMIZER@
 CFLAGS	= @ENVOPTS@ @LIBCOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH} ${CONF_LIBRARY}
 #
 SRCS	= \
diff --git a/port/Makefile.in b/port/Makefile.in
index 3df5c53f..229edcac 100644
--- a/port/Makefile.in
+++ b/port/Makefile.in
@@ -1,5 +1,5 @@
 #! smake
-#	$Header: /cvs/maptools/cvsroot/libtiff/port/Makefile.in,v 1.1 1999-07-27 21:50:28 mike Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/port/Makefile.in,v 1.2 2001-03-30 01:55:32 warmerda Exp $
 #
 # @WARNING@
 #
@@ -46,7 +46,7 @@ RANLIB	= @RANLIB@
 
 IPATH	= -I. -I${SRCDIR}
 COPTS	= @GCOPTS@
-OPTIMIZER=-O
+OPTIMIZER=@OPTIMIZER@
 CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
 
 CFILES	= @PORTFUNCS@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 344d30fd..8d3a1bbf 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-#	$Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.in,v 1.5 2001-03-02 04:58:46 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/tools/Makefile.in,v 1.6 2001-03-30 01:55:32 warmerda Exp $
 #
 # @WARNING@
 #
@@ -43,7 +43,7 @@ CC	= @CCOMPILER@
 INSTALL	= @INSTALL@
 #
 COPTS	= @GCOPTS@
-OPTIMIZER=-O
+OPTIMIZER=@OPTIMIZER@
 IPATH	= -I. -I${SRCDIR} -I${LIBDIR}
 CFLAGS	= @ENVOPTS@ ${COPTS} ${OPTIMIZER} ${IPATH}
 #