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

Switched back to the old behaviour. Likely better solution should be found for

Browse Source 
OJPEG support.
This commit is contained in:
Andrey Kiselev 2003-05-20 15:22:52 +00:00
parent a1a66ec665
commit a77c9ce727
2 changed files with 3 additions and 10 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
# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.34 2003-05-06 12:58:19 dron Exp $
# $Header: /cvs/maptools/cvsroot/libtiff/Makefile.in,v 1.35 2003-05-20 15:22:52 dron Exp $
#
# @WARNING@
#
@ -50,11 +50,6 @@ all default:
else \
true; \
fi
@if [ "@OJPEG@" = yes ]; then \
${ECHO} "= "ojpeg; cd contrib/ojpeg; ${MAKE} -${MAKEFLAGS}; \
else \
true; \
fi
@${ECHO} "= "libtiff; cd libtiff; ${MAKE} -${MAKEFLAGS}
@${ECHO} "= "tools; cd tools; ${MAKE} -${MAKEFLAGS}
@${ECHO} "= "man; cd man; ${MAKE} -${MAKEFLAGS}

6
configure vendored
View File

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