cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved libtiff compilation with OJPEG support. Now no need for patching

Browse Source 
IJG JPEG library, hack requred by libtiff will be compiled and used in-place.
This commit is contained in:
Andrey Kiselev 2003-05-06 12:58:19 +00:00
parent 6dd0fd5c64
commit 4e06689428
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.in
View File

@ -1,5 +1,5 @@
#! smake #! smake
# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.33 2002-10-15 02:30:31 warmerda Exp $ # $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.34 2003-05-06 12:58:19 dron Exp $
# #
# @WARNING@ # @WARNING@
# #
@ -50,6 +50,11 @@ all default:
else \ else \
true; \ true; \
fi fi
@if [ "@OJPEG@" = yes ]; then \
${ECHO} "= "ojpeg; cd contrib/ojpeg; ${MAKE} -${MAKEFLAGS}; \
else \
true; \
fi
@${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS} @${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS}
@${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS} @${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS}
@${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS} @${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS}

6
configure vendored
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.27 2002-10-11 14:33:49 dron Exp $ # $Header: /cvs/maptools/cvsroot/libtiff/configure,v 1.28 2003-05-06 12:58:19 dron 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.27 $" echo "This is TIFF configure $Revision: 1.28 $"
exit 0 exit 0
;; ;;
-help|--help) usage; exit 0;; -help|--help) usage; exit 0;;
@ -1699,6 +1699,7 @@ if [ "${JPEG}" = yes ]; then
fi fi
if [ "${OJPEG}" = yes ]; then if [ "${OJPEG}" = yes ]; then
CONF_JPEG="$CONF_JPEG -DOJPEG_SUPPORT" CONF_JPEG="$CONF_JPEG -DOJPEG_SUPPORT"
LIBJPEG="${LIBJPEG} -Lcontrib/ojpeg -lojpeg"
fi fi
else else
CONF_JPEG= CONF_JPEG=
@ -1910,6 +1911,7 @@ if [ $SRCDIR_IS_LIBTIFF != yes ] ; then
" "
test $HTML = yes && CONF_FILES="$CONF_FILES html/Makefile" test $HTML = yes && CONF_FILES="$CONF_FILES html/Makefile"
test $PORT = yes && CONF_FILES="$CONF_FILES port/Makefile" test $PORT = yes && CONF_FILES="$CONF_FILES port/Makefile"
test $OJPEG = yes && CONF_FILES="$CONF_FILES contrib/ojpeg/Makefile"
fi fi
SedConfigFiles $CONF_FILES SedConfigFiles $CONF_FILES