From 8caaca6797a8c577cf52ec6be4b7867442fa7017 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Tue, 5 Feb 2002 17:46:57 +0000
Subject: [PATCH] added OJPEG option

---
 config.site | 8 +++++++-
 configure   | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config.site b/config.site
index 364ebec4..edf2bd38 100644
--- a/config.site
+++ b/config.site
@@ -1,4 +1,4 @@
-# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.6 2001-04-06 02:52:35 warmerda Exp $
+# $Header: /cvs/maptools/cvsroot/libtiff/Attic/config.site,v 1.7 2002-02-05 17:46:57 warmerda Exp $
 #
 # TIFF Software
 #
@@ -99,6 +99,12 @@
 #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
 #DIR_JPEGLIB=../src/jpeg-6b		# directory for libjpeg
 
+# The following will enable OJPEG support.  Note that a patch libjpeg is
+# required before this can be enabled.  It is also only supported if JPEG is
+# enabled.  
+
+#OJPEG="yes"			        # yes|no configure OJPEG support
+
 #
 # Deflate-specific parameters; used when Deflate support is enabled (see above).
 #
diff --git a/configure b/configure
index 501fe6d0..355452fb 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.22 2002-01-18 18:58:19 warmerda Exp $
+#	$Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.23 2002-02-05 17:46:57 warmerda Exp $
 #
 # Tag Image File Format (TIFF) Software
 #
@@ -152,7 +152,7 @@ do
     -target|--target)		ac_prev=TARGET;;
     -target=*|--target=*)	TARGET="$ac_optarg" ;;
     -version|--version)
-	echo "This is TIFF configure $Revision: 1.22 $"
+	echo "This is TIFF configure $Revision: 1.23 $"
 	exit 0
 	;;
     -help|--help)		usage; exit 0;;
@@ -1684,6 +1684,9 @@ if [ "${JPEG}" = yes ]; then
       LIBJPEG="-ljpeg"
       test -z "${DIR_JPEGLIB-}" || LIBJPEG="-L${DIR_JPEGLIB} ${LIBJPEG}"
     fi
+    if [ "${OJPEG}" = yes ]; then
+      CONF_JPEG="$CONF_JPEG -DOJPEG_SUPPORT"
+    fi
 else
     CONF_JPEG=
     LIBJPEG=