*** empty log message ***

This commit is contained in:
Andrey Kiselev 2004-03-29 11:28:16 +00:00
parent f4c312322b
commit fcee268927
6 changed files with 1506 additions and 315 deletions

1407
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
dnl -*- Autoconf -*-
dnl $Id: configure.ac,v 1.3 2004-03-28 12:01:23 dron Exp $
dnl $Id: configure.ac,v 1.4 2004-03-29 11:31:45 dron Exp $
dnl
dnl Tag Image File Format (TIFF) Software
dnl
@ -87,6 +87,108 @@ AC_FUNC_REALLOC
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([floor gettimeofday isascii memmove memset munmap pow sqrt strcasecmp strchr strncasecmp strrchr strstr strtol strtoul])
AC_SYS_LARGEFILE
dnl ---------------------------------------------------------------------------
dnl Check for ZLIB.
dnl ---------------------------------------------------------------------------
HAVE_ZLIB=no
AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [disable Zlib usage (required for Deflate compression, enabled by default)]),,)
AC_ARG_WITH(zlib-inc,AS_HELP_STRING([--with-zlib-inc=ARG], [location of Zlib headers (specify, if not in standard place)]),,)
AC_ARG_WITH(zlib-lib,AS_HELP_STRING([--with-zlib-lib=ARG], [location of Zlib library binary (specify, if not in standard place)]),,)
if test "x$enable_zlib" != "xno" ; then
if test "x$with_zlib_lib" = "xyes" ; then
AC_CHECK_LIB(z, inflateEnd, [zlib_lib=yes], [zlib_lib=no],)
elif test "x$with_zlib_lib" != "xno" ; then
LIBS="$with_zlib_lib $LIBS"
AC_CHECK_LIB(z, inflateEnd, [zlib_lib=yes], [zlib_lib=no],)
if test "$zlib_lib" = "no" ; then
AC_MSG_ERROR([Zlib library not found in $with_zlib_lib])
fi
fi
if test "x$with_zlib_h" = "xyes" ; then
AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no])
elif test "x$with_zlib_h" != "xno" ; then
INCLUDE="$with_zlib_h $INCLUDE"
AC_CHECK_HEADER(zlib.h, [zlib_h=yes], [zlib_h=no])
if test "$zlib_h" = "no" ; then
AC_MSG_ERROR([Zlib headers not found in $with_zlib_h])
fi
fi
if test "$zlib_lib" = "yes" -a "$zlib_h" = "yes" ; then
HAVE_ZLIB=yes
fi
fi
if test "$HAVE_ZLIB" = "yes" ; then
CPPFLAGS="-DZIP_SUPPORT $CPPFLAGS"
LIBS="-lz $LIBS"
fi
dnl ---------------------------------------------------------------------------
dnl Check for JPEG.
dnl ---------------------------------------------------------------------------
HAVE_JPEG=no
AC_ARG_ENABLE(jpeg, AS_HELP_STRING([--disable-jpeg], [disable IJG JPEG library usage (required for JPEG compression, enabled by default)]),,)
AC_ARG_WITH(jpeg-inc,AS_HELP_STRING([--with-jpeg-inc=ARG], [location of IJG JPEG library headers (specify, if not in standard place)]),,)
AC_ARG_WITH(jpeg-lib,AS_HELP_STRING([--with-jpeg-lib=ARG], [location of IJG JPEG library binary (specify, if not in standard place)]),,)
if test "x$enable_jpeg" != "xno" ; then
if test "x$with_jpeg_lib" = "xyes" ; then
AC_CHECK_LIB(jpeg, jpeg_read_scanlines, [jpeg_lib=yes], [jpeg_lib=no],)
elif test "x$with_jpeg_lib" != "xno" ; then
LIBS="$with_jpeg_lib $LIBS"
AC_CHECK_LIB(jpeg, jpeg_read_scanlines, [jpeg_lib=yes], [jpeg_lib=no],)
if test "$jpeg_lib" = "no" ; then
AC_MSG_ERROR([IJG JPEG library not found in $with_jpeg_lib])
fi
fi
if test "x$with_jpeg_h" = "xyes" ; then
AC_CHECK_HEADER(jpeglib.h, [jpeg_h=yes], [jpeg_h=no])
elif test "x$with_jpeg_h" != "xno" ; then
INCLUDE="$with_jpeg_h $INCLUDE"
AC_CHECK_HEADER(jpeglib.h, [jpeg_h=yes], [jpeg_h=no])
if test "$jpeg_h" = "no" ; then
AC_MSG_ERROR([IJG JPEG library headers not found in $with_jpeg_h])
fi
fi
if test "$jpeg_lib" = "yes" -a "$jpeg_h" = "yes" ; then
HAVE_JPEG=yes
fi
fi
if test "$HAVE_JPEG" = "yes" ; then
CPPFLAGS="-DJPEG_SUPPORT $CPPFLAGS"
LIBS="-ljpeg $LIBS"
fi
dnl ---------------------------------------------------------------------------
dnl Check for Old JPEG.
dnl ---------------------------------------------------------------------------
HAVE_OJPEG=no
AC_ARG_ENABLE(old-jpeg, AS_HELP_STRING([--enable-old-jpeg], [enable support for Old JPEG compresson (read contrib/ojpeg/README first! Compilation fails with unpatched IJG JPEG library)]), [HAVE_OJPEG=yes], [HAVE_OJPEG=no])
if test "$HAVE_JPEG" = "yes" -a "$HAVE_OJPEG" = "yes" ; then
CPPFLAGS="-DOJPEG_SUPPORT $CPPFLAGS"
fi
dnl ---------------------------------------------------------------------------
AC_SUBST(LIBTIFF,../libtiff/libtiff.la)
AC_CONFIG_FILES([Makefile \
@ -95,6 +197,8 @@ AC_CONFIG_FILES([Makefile \
html/man/Makefile \
libtiff/Makefile \
man/Makefile \
port/Makefile \
tools/Makefile])
AC_OUTPUT

View File

@ -1,258 +0,0 @@
#! @SCRIPT_SH@
# $Header: /cvs/maptools/cvsroot/libtiff/port/Attic/install.sh.in,v 1.3 2003-10-25 17:48:09 dron Exp $
#
# @WARNING@
#
# HylaFAX Facsimile Software
#
# Copyright (c) 1990-1997 Sam Leffler
# Copyright (c) 1991-1997 Silicon Graphics, Inc.
# HylaFAX is a trademark of Silicon Graphics
#
# Permission to use, copy, modify, distribute, and sell this software and
# its documentation for any purpose is hereby granted without fee, provided
# that (i) the above copyright notices and this permission notice appear in
# all copies of the software and related documentation, and (ii) the names of
# Sam Leffler and Silicon Graphics may not be used in any advertising or
# publicity relating to the software without the specific, prior written
# permission of Sam Leffler and Silicon Graphics.
#
# THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
#
# IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
# ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
# OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
# WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
# LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
#
# Warning, this file was automatically created by the HylaFAX configure script
#
# VERSION: @VERSION@
# DATE: @DATE@
# TARGET: @TARGET@
#
#
# Shell script to emulate Silicon Graphics install program.
# We emulate the non-standard interface used by install so
# that we can build SGI inst packages on SGI systems. Note
# that we cannot emulate everything because we don't maintain
# a history of installed software; thus we cannot tell when
# configuration files have been modified and save old copies.
#
# NB: we don't do chown/chmod/chgrp by default; it must be
# explicitly set on the command line.
#
#
# install [options] files ...
#
# Options are:
#
# -o save existing target foo as OLDfoo
# -O remove existing target foo, if it fails save as OLDfoo
# -m mode set mode of installed target
# -u uid set uid of installed target
# -g gid set gid of installed target
# -root path set ROOT directory for target pathnames
# -dir create directories
# -fifo create FIFO special files
# -ln path create hard link
# -lns path create symbolic link
# -src path source pathname different from target
# -f dir install files in the target directory ROOT/dir
# -F dir like -f, but create directories that do not exist
# -v echo actions
# -idb stuff specify package and, optionally, do special work
#
preopts=
postopts=
SaveFirst=no
HasSource=yes
RemoveFirst=no
NoUpdate=no
Suggested=no
Updated=no
CMD=cp
SRC=
FILES=
DESTDIR=
CHMOD=":"
CHOWN=":"
CHGRP=":"
RM="rm -f"
MV="mv @MV_F@"
ECHO=echo
VERBOSE=":"
STRIP="@STRIP@"
CMP=cmp
TARGETS=
while [ x"$1" != x ]
do
arg=$1
case $arg in
-m) shift; CHMOD="@CHMOD@ $1";;
-u) shift; CHOWN="@CHOWN@ $1";;
-g) shift; CHGRP="@CHGRP@ $1";;
-o) SaveFirst=yes;;
-O) RemoveFirst=yes; SaveFirst=yes;;
-root) shift; ROOT=$1;;
-dir) CMD="mkdir -p"; HasSource=no;
RM=":"; STRIP=":"
;;
-fifo) CMD=@MKFIFO@; HasSource=no;
x=`echo $CMD | @SED@ 's;.*/;;'`;
test $x = mknod && postopts="p";
STRIP=":"
;;
-ln) shift; CMD=@LN@; SRC="$1"
STRIP=":"
;;
-lns) shift; CMD=@LN@; preopts="@LN_S@"; SRC="$1"
STRIP=":"
;;
-src) shift; SRC="$1";;
-[fF]) shift; DESTDIR="$1";;
-idb) shift; opt="$1"
case "$opt" in
*config\(update\)*) Updated=yes;;
*config\(suggest\)*) Suggested=yes;;
*config\(noupdate\)*) NoUpdate=yes;;
*nostrip*) STRIP=":";;
esac
;;
# these are skipped/not handled
-new|-rawidb|-blk|-chr) shift;;
-v) VERBOSE=$ECHO;;
-*) ;;
*) TARGETS="$TARGETS $arg";;
esac
shift
done
if [ "$ROOT" != "" ] ; then
ROOT_PREFIX=${ROOT}/
else
ROOT_PREFIX=
fi
if [ "$DESTDIR" != "" ] ; then
DESTDIR_PREFIX=${DESTDIR}/
else
DESTDIR_PREFIX=
fi
#
# Install the specified target.
#
install()
{
src=$1 target=$2
if [ $RemoveFirst = yes -a -f $target ]; then
$VERBOSE "$RM $target"
$RM $target
fi
if [ $SaveFirst = yes -a -f $target ]; then
bf=`echo $src | @SED@ 's;.*/;;'`
$VERBOSE "$MV $target ${ROOT_PREFIX}${DESTDIR_PREFIX}OLD$bf"
$MV $target ${ROOT_PREFIX}${DESTDIR_PREFIX}OLD$bf
fi
if [ -z "$SRC" -a $HasSource = yes ]; then
$VERBOSE "$CMD $preopts $src $target $postopts"
$CMD $preopts $f $target $postopts
else
$VERBOSE "$CMD $preopts $SRC $target $postopts"
$CMD $preopts $SRC $target $postopts
fi
if [ $? -eq 0 ]; then
$VERBOSE "$CHOWN $target"
$CHOWN $target
$VERBOSE "$CHGRP $target"
$CHGRP $target
$VERBOSE "$CHMOD $target"
$CHMOD $target
if [ $STRIP != ":" -a -x ${ROOT_PREFIX}${DESTDIR_PREFIX}$f ]; then
$STRIP $target >/dev/null 2>&1 || true
$VERBOSE "$STRIP $target"
fi
fi
}
if [ $Suggested = yes ]; then
#
# A suggested file. If an existing target does
# not exist, then install it. Otherwise, install
# it as target.N if it's different from the current
# installed target.
#
# NB: cannot be used with a special file 'cuz we
# use test -f to see if the file exists.
#
for f in $TARGETS; do
t=${ROOT_PREFIX}${DESTDIR_PREFIX}$f
if [ -f $t ]; then
if [ -z "$SRC" -a $HasSource = yes ]; then
$CMP -s $f $t || {
$ECHO "*** Warning, target has local changes, installing $f as $t.N"
install $f $t.N;
}
else
$CMP -s $SRC $t || {
$ECHO "*** Warning, target has local changes, installing $f as $t.N"
install $f $t.N
}
fi
else
install $f $t
fi
done
elif [ $Updated = yes ]; then
#
# A file to be updated. If an existing target does
# not exist, then install it. Otherwise, install
# it as target and save the old version as target.O
# if the old version is different from the current
# installed target.
#
# NB: cannot be used with a special file 'cuz we
# use test -f to see if the file exists.
#
for f in $TARGETS; do
t=${ROOT_PREFIX}${DESTDIR_PREFIX}$f
if [ -f $t ]; then
if [ -z "$SRC" -a $HasSource = yes ]; then
$CMP -s $f $t || $MV $t $t.O
else
$CMP -s $SRC $t || $MV $t $t.O
fi
fi
install $f $t
done
elif [ $NoUpdate = yes ]; then
#
# A file that is never to be updated; the target
# is created only if it does not exist.
#
# NB: cannot be used with a special file 'cuz we
# use test -f to see if the file exists.
#
for f in $TARGETS; do
t=${ROOT_PREFIX}${DESTDIR_PREFIX}$f
test -f $t || install $f $t
done
else
#
# Normal case, a target that should be installed
# with the existing copy, optionally, saved first.
#
for f in $TARGETS; do
install $f ${ROOT_PREFIX}${DESTDIR_PREFIX}$f
done
fi

View File

@ -1,4 +0,0 @@
libtiff.so \
:st = .text 0x5ff70000, 0x00030000:\
:st = .data 0x5ffd0000, 0x00030000:\

View File

@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.2 2004-03-28 11:18:36 dron Exp $
# $Id: Makefile.am,v 1.3 2004-03-29 11:32:20 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
@ -55,7 +55,7 @@ bin_PROGRAMS = \
tiffset \
tiffsplit \
$(BIN_TIFFGT)
EXTRA_PROGRAMS = $(BIN_TIFFGT) sgi2tiff.c sgisv.c ycbcr.c
EXTRA_PROGRAMS = $(BIN_TIFFGT) sgi2tiff sgisv ycbcr
fax2ps_SOURCES = fax2ps.c
fax2ps_LDADD = @LIBTIFF@

View File

@ -14,7 +14,7 @@
@SET_MAKE@
# $Id: Makefile.in,v 1.16 2004-03-28 11:18:36 dron Exp $
# $Id: Makefile.in,v 1.17 2004-03-29 11:32:20 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
@ -72,8 +72,8 @@ bin_PROGRAMS = fax2ps$(EXEEXT) fax2tiff$(EXEEXT) gif2tiff$(EXEEXT) \
tiffdither$(EXEEXT) tiffdump$(EXEEXT) tiffgt$(EXEEXT) \
tiffinfo$(EXEEXT) tiffmedian$(EXEEXT) tiffset$(EXEEXT) \
tiffsplit$(EXEEXT) $(am__EXEEXT_1)
EXTRA_PROGRAMS = $(am__EXEEXT_1) sgi2tiff.c$(EXEEXT) sgisv.c$(EXEEXT) \
ycbcr.c$(EXEEXT)
EXTRA_PROGRAMS = $(am__EXEEXT_1) sgi2tiff$(EXEEXT) sgisv$(EXEEXT) \
ycbcr$(EXEEXT)
subdir = tools
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@ -111,12 +111,12 @@ raw2tiff_DEPENDENCIES =
am_rgb2ycbcr_OBJECTS = rgb2ycbcr.$(OBJEXT)
rgb2ycbcr_OBJECTS = $(am_rgb2ycbcr_OBJECTS)
rgb2ycbcr_DEPENDENCIES =
sgi2tiff_c_SOURCES = sgi2tiff.c
sgi2tiff_c_OBJECTS = sgi2tiff.$(OBJEXT)
sgi2tiff_c_LDADD = $(LDADD)
sgisv_c_SOURCES = sgisv.c
sgisv_c_OBJECTS = sgisv.$(OBJEXT)
sgisv_c_LDADD = $(LDADD)
sgi2tiff_SOURCES = sgi2tiff.c
sgi2tiff_OBJECTS = sgi2tiff.$(OBJEXT)
sgi2tiff_LDADD = $(LDADD)
sgisv_SOURCES = sgisv.c
sgisv_OBJECTS = sgisv.$(OBJEXT)
sgisv_LDADD = $(LDADD)
am_thumbnail_OBJECTS = thumbnail.$(OBJEXT)
thumbnail_OBJECTS = $(am_thumbnail_OBJECTS)
thumbnail_DEPENDENCIES =
@ -159,9 +159,9 @@ tiffset_DEPENDENCIES =
am_tiffsplit_OBJECTS = tiffsplit.$(OBJEXT)
tiffsplit_OBJECTS = $(am_tiffsplit_OBJECTS)
tiffsplit_DEPENDENCIES =
ycbcr_c_SOURCES = ycbcr.c
ycbcr_c_OBJECTS = ycbcr.$(OBJEXT)
ycbcr_c_LDADD = $(LDADD)
ycbcr_SOURCES = ycbcr.c
ycbcr_OBJECTS = ycbcr.$(OBJEXT)
ycbcr_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/libtiff
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -437,12 +437,12 @@ raw2tiff$(EXEEXT): $(raw2tiff_OBJECTS) $(raw2tiff_DEPENDENCIES)
rgb2ycbcr$(EXEEXT): $(rgb2ycbcr_OBJECTS) $(rgb2ycbcr_DEPENDENCIES)
@rm -f rgb2ycbcr$(EXEEXT)
$(LINK) $(rgb2ycbcr_LDFLAGS) $(rgb2ycbcr_OBJECTS) $(rgb2ycbcr_LDADD) $(LIBS)
sgi2tiff.c$(EXEEXT): $(sgi2tiff_c_OBJECTS) $(sgi2tiff_c_DEPENDENCIES)
@rm -f sgi2tiff.c$(EXEEXT)
$(LINK) $(sgi2tiff_c_LDFLAGS) $(sgi2tiff_c_OBJECTS) $(sgi2tiff_c_LDADD) $(LIBS)
sgisv.c$(EXEEXT): $(sgisv_c_OBJECTS) $(sgisv_c_DEPENDENCIES)
@rm -f sgisv.c$(EXEEXT)
$(LINK) $(sgisv_c_LDFLAGS) $(sgisv_c_OBJECTS) $(sgisv_c_LDADD) $(LIBS)
sgi2tiff$(EXEEXT): $(sgi2tiff_OBJECTS) $(sgi2tiff_DEPENDENCIES)
@rm -f sgi2tiff$(EXEEXT)
$(LINK) $(sgi2tiff_LDFLAGS) $(sgi2tiff_OBJECTS) $(sgi2tiff_LDADD) $(LIBS)
sgisv$(EXEEXT): $(sgisv_OBJECTS) $(sgisv_DEPENDENCIES)
@rm -f sgisv$(EXEEXT)
$(LINK) $(sgisv_LDFLAGS) $(sgisv_OBJECTS) $(sgisv_LDADD) $(LIBS)
thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES)
@rm -f thumbnail$(EXEEXT)
$(LINK) $(thumbnail_LDFLAGS) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS)
@ -485,9 +485,9 @@ tiffset$(EXEEXT): $(tiffset_OBJECTS) $(tiffset_DEPENDENCIES)
tiffsplit$(EXEEXT): $(tiffsplit_OBJECTS) $(tiffsplit_DEPENDENCIES)
@rm -f tiffsplit$(EXEEXT)
$(LINK) $(tiffsplit_LDFLAGS) $(tiffsplit_OBJECTS) $(tiffsplit_LDADD) $(LIBS)
ycbcr.c$(EXEEXT): $(ycbcr_c_OBJECTS) $(ycbcr_c_DEPENDENCIES)
@rm -f ycbcr.c$(EXEEXT)
$(LINK) $(ycbcr_c_LDFLAGS) $(ycbcr_c_OBJECTS) $(ycbcr_c_LDADD) $(LIBS)
ycbcr$(EXEEXT): $(ycbcr_OBJECTS) $(ycbcr_DEPENDENCIES)
@rm -f ycbcr$(EXEEXT)
$(LINK) $(ycbcr_LDFLAGS) $(ycbcr_OBJECTS) $(ycbcr_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)