added OJPEG option

This commit is contained in:
Frank Warmerdam 2002-02-05 17:46:57 +00:00
parent 632c9097d5
commit 8caaca6797
2 changed files with 12 additions and 3 deletions

View File

@ -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 # TIFF Software
# #
@ -99,6 +99,12 @@
#DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files #DIRS_LIBINC="$DIRS_LIBINC ../src/jpeg-6b" # directory for jpeg include files
#DIR_JPEGLIB=../src/jpeg-6b # directory for libjpeg #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). # Deflate-specific parameters; used when Deflate support is enabled (see above).
# #

7
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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 # Tag Image File Format (TIFF) Software
# #
@ -152,7 +152,7 @@ do
-target|--target) ac_prev=TARGET;; -target|--target) ac_prev=TARGET;;
-target=*|--target=*) TARGET="$ac_optarg" ;; -target=*|--target=*) TARGET="$ac_optarg" ;;
-version|--version) -version|--version)
echo "This is TIFF configure $Revision: 1.22 $" echo "This is TIFF configure $Revision: 1.23 $"
exit 0 exit 0
;; ;;
-help|--help) usage; exit 0;; -help|--help) usage; exit 0;;
@ -1684,6 +1684,9 @@ if [ "${JPEG}" = yes ]; then
LIBJPEG="-ljpeg" LIBJPEG="-ljpeg"
test -z "${DIR_JPEGLIB-}" || LIBJPEG="-L${DIR_JPEGLIB} ${LIBJPEG}" test -z "${DIR_JPEGLIB-}" || LIBJPEG="-L${DIR_JPEGLIB} ${LIBJPEG}"
fi fi
if [ "${OJPEG}" = yes ]; then
CONF_JPEG="$CONF_JPEG -DOJPEG_SUPPORT"
fi
else else
CONF_JPEG= CONF_JPEG=
LIBJPEG= LIBJPEG=