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

Use libtool machinery to pass rpath option.

Browse Source
This commit is contained in:
Andrey Kiselev 2005-03-22 10:33:04 +00:00
parent 85cbe2fbc2
commit 40ae66301e
27 changed files with 168 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@ -148,11 +148,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

77
configure vendored
View File

@ -464,7 +464,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_ALPHA_VERSION LIBTIFF_VERSION LIBTIFF_RELEASE_DATE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LIBTIFF_DOCDIR HAVE_CXX_TRUE HAVE_CXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GL_CFLAGS GL_LIBS GLU_CFLAGS GLU_LIBS GLUT_CFLAGS GLUT_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTIFF_MAJOR_VERSION LIBTIFF_MINOR_VERSION LIBTIFF_MICRO_VERSION LIBTIFF_ALPHA_VERSION LIBTIFF_VERSION LIBTIFF_RELEASE_DATE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HAVE_RPATH_TRUE HAVE_RPATH_FALSE LIBTIFF_DOCDIR HAVE_CXX_TRUE HAVE_CXX_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS GL_CFLAGS GL_LIBS GLU_CFLAGS GLU_LIBS GLUT_CFLAGS GLUT_LIBS HAVE_OPENGL_TRUE HAVE_OPENGL_FALSE LIBDIR LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -22671,6 +22671,16 @@ else
fi;
if test "$HAVE_RPATH" = "yes"; then
HAVE_RPATH_TRUE=
HAVE_RPATH_FALSE='#'
else
HAVE_RPATH_TRUE='#'
HAVE_RPATH_FALSE=
fi
# Check whether --enable-largefile or --disable-largefile was given.
if test "${enable_largefile+set}" = set; then
enableval="$enable_largefile"
@ -23169,11 +23179,6 @@ if test "x$enable_zlib" != "xno" ; then
if test "x$with_zlib_lib_dir" != "x" ; then
LDFLAGS="-L$with_zlib_lib_dir $LDFLAGS"
if test "$HAVE_RPATH" = "yes"; then
LDFLAGS="-rpath$with_zlib_lib_dir $LDFLAGS"
fi
fi
echo "$as_me:$LINENO: checking for inflateEnd in -lz" >&5
@ -23416,6 +23421,11 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
LIBS="-lz $LIBS"
if test "$HAVE_RPATH" = "yes"; then
LIBDIR="-R $with_zlib_lib_dir $LIBDIR"
fi
fi
@ -23463,10 +23473,6 @@ if test "x$enable_jpeg" != "xno" ; then
if test "x$with_jpeg_lib_dir" != "x" ; then
LDFLAGS="-L$with_jpeg_lib_dir $LDFLAGS"
if test "$HAVE_RPATH" = "yes"; then
LDFLAGS="-rpath$with_jpeg_lib_dir $LDFLAGS"
fi
fi
echo "$as_me:$LINENO: checking for jpeg_read_scanlines in -ljpeg" >&5
@ -23709,6 +23715,11 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
LIBS="-ljpeg $LIBS"
if test "$HAVE_RPATH" = "yes"; then
LIBDIR="-R $with_jpeg_lib_dir $LIBDIR"
fi
fi
@ -26198,6 +26209,8 @@ _ACEOF
fi
ac_config_headers="$ac_config_headers libtiff/tif_config.h libtiff/tiffconf.h"
@ -26329,6 +26342,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_RPATH_TRUE}" && test -z "${HAVE_RPATH_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_RPATH\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"HAVE_RPATH\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"HAVE_CXX\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@ -26978,6 +26998,8 @@ s,@FFLAGS@,$FFLAGS,;t t
s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@HAVE_RPATH_TRUE@,$HAVE_RPATH_TRUE,;t t
s,@HAVE_RPATH_FALSE@,$HAVE_RPATH_FALSE,;t t
s,@LIBTIFF_DOCDIR@,$LIBTIFF_DOCDIR,;t t
s,@HAVE_CXX_TRUE@,$HAVE_CXX_TRUE,;t t
s,@HAVE_CXX_FALSE@,$HAVE_CXX_FALSE,;t t
@ -26997,6 +27019,7 @@ s,@GLUT_CFLAGS@,$GLUT_CFLAGS,;t t
s,@GLUT_LIBS@,$GLUT_LIBS,;t t
s,@HAVE_OPENGL_TRUE@,$HAVE_OPENGL_TRUE,;t t
s,@HAVE_OPENGL_FALSE@,$HAVE_OPENGL_FALSE,;t t
s,@LIBDIR@,$LIBDIR,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
@ -27719,28 +27742,28 @@ fi
echo ""
echo "Libtiff is now configured for ${host}"
echo ""
echo " Installation directory: ${prefix}"
echo " Documentation directory: ${LIBTIFF_DOCDIR}"
echo " C compiler: ${CC} ${CFLAGS}"
echo " C++ compiler: ${CXX} ${CXXFLAGS}"
echo " Enable runtime linker paths: ${HAVE_RPATH}"
echo " Installation directory: ${prefix}"
echo " Documentation directory: ${LIBTIFF_DOCDIR}"
echo " C compiler: ${CC} ${CFLAGS}"
echo " C++ compiler: ${CXX} ${CXXFLAGS}"
echo " Enable runtime linker paths: ${HAVE_RPATH}"
echo ""
echo " Support for internal codecs:"
echo " CCITT Group 3 & 4 algorithms: ${HAVE_CCITT}"
echo " Macintosh PackBits algorithm: ${HAVE_PACKBITS}"
echo " LZW algorithm: ${HAVE_LZW}"
echo " ThunderScan 4-bit RLE algorithm: ${HAVE_THUNDER}"
echo " NeXT 2-bit RLE algorithm: ${HAVE_NEXT}"
echo " LogLuv high dynamic range encoding:${HAVE_LOGLUV}"
echo " CCITT Group 3 & 4 algorithms: ${HAVE_CCITT}"
echo " Macintosh PackBits algorithm: ${HAVE_PACKBITS}"
echo " LZW algorithm: ${HAVE_LZW}"
echo " ThunderScan 4-bit RLE algorithm: ${HAVE_THUNDER}"
echo " NeXT 2-bit RLE algorithm: ${HAVE_NEXT}"
echo " LogLuv high dynamic range encoding: ${HAVE_LOGLUV}"
echo ""
echo " Support for external codecs:"
echo " ZLIB support: ${HAVE_ZLIB}"
echo " Pixar log-format algorithm: ${HAVE_PIXARLOG}"
echo " JPEG support: ${HAVE_JPEG}"
echo " Old JPEG support: ${HAVE_OJPEG}"
echo " ZLIB support: ${HAVE_ZLIB}"
echo " Pixar log-format algorithm: ${HAVE_PIXARLOG}"
echo " JPEG support: ${HAVE_JPEG}"
echo " Old JPEG support: ${HAVE_OJPEG}"
echo ""
echo " C++ support: ${HAVE_CXX}"
echo " C++ support: ${HAVE_CXX}"
echo ""
echo " OpenGL support: ${HAVE_OPENGL}"
echo " OpenGL support: ${HAVE_OPENGL}"
echo ""

56
configure.ac
View File

@ -151,6 +151,7 @@ AC_ARG_ENABLE(rpath,
AS_HELP_STRING([--enable-rpath],
[Enable runtime linker paths (-R libtool option)]),
[HAVE_RPATH=$enableval], [HAVE_RPATH=no])
AM_CONDITIONAL(HAVE_RPATH, test "$HAVE_RPATH" = "yes")
dnl ---------------------------------------------------------------------------
dnl Support large files.
@ -253,11 +254,6 @@ if test "x$enable_zlib" != "xno" ; then
if test "x$with_zlib_lib_dir" != "x" ; then
LDFLAGS="-L$with_zlib_lib_dir $LDFLAGS"
if test "$HAVE_RPATH" = "yes"; then
LDFLAGS="-rpath$with_zlib_lib_dir $LDFLAGS"
fi
fi
AC_CHECK_LIB(z, inflateEnd, [zlib_lib=yes], [zlib_lib=no],)
@ -282,6 +278,11 @@ fi
if test "$HAVE_ZLIB" = "yes" ; then
AC_DEFINE(ZIP_SUPPORT,1,[Support Deflate compression])
LIBS="-lz $LIBS"
if test "$HAVE_RPATH" = "yes"; then
LIBDIR="-R $with_zlib_lib_dir $LIBDIR"
fi
fi
dnl ---------------------------------------------------------------------------
@ -321,10 +322,6 @@ if test "x$enable_jpeg" != "xno" ; then
if test "x$with_jpeg_lib_dir" != "x" ; then
LDFLAGS="-L$with_jpeg_lib_dir $LDFLAGS"
if test "$HAVE_RPATH" = "yes"; then
LDFLAGS="-rpath$with_jpeg_lib_dir $LDFLAGS"
fi
fi
AC_CHECK_LIB(jpeg, jpeg_read_scanlines, [jpeg_lib=yes], [jpeg_lib=no],)
@ -349,6 +346,11 @@ fi
if test "$HAVE_JPEG" = "yes" ; then
AC_DEFINE(JPEG_SUPPORT,1,[Support JPEG compression (requires IJG JPEG library)])
LIBS="-ljpeg $LIBS"
if test "$HAVE_RPATH" = "yes"; then
LIBDIR="-R $with_jpeg_lib_dir $LIBDIR"
fi
fi
dnl ---------------------------------------------------------------------------
@ -458,6 +460,8 @@ fi
dnl ---------------------------------------------------------------------------
AC_SUBST(LIBDIR)
AC_CONFIG_HEADERS([libtiff/tif_config.h libtiff/tiffconf.h])
AC_CONFIG_FILES([Makefile \
@ -493,28 +497,28 @@ dnl ---------------------------------------------------------------------------
LOC_MSG()
LOC_MSG([Libtiff is now configured for ${host}])
LOC_MSG()
LOC_MSG([ Installation directory: ${prefix}])
LOC_MSG([ Documentation directory: ${LIBTIFF_DOCDIR}])
LOC_MSG([ C compiler: ${CC} ${CFLAGS}])
LOC_MSG([ C++ compiler: ${CXX} ${CXXFLAGS}])
LOC_MSG([ Enable runtime linker paths: ${HAVE_RPATH}])
LOC_MSG([ Installation directory: ${prefix}])
LOC_MSG([ Documentation directory: ${LIBTIFF_DOCDIR}])
LOC_MSG([ C compiler: ${CC} ${CFLAGS}])
LOC_MSG([ C++ compiler: ${CXX} ${CXXFLAGS}])
LOC_MSG([ Enable runtime linker paths: ${HAVE_RPATH}])
LOC_MSG()
LOC_MSG([ Support for internal codecs:])
LOC_MSG([ CCITT Group 3 & 4 algorithms: ${HAVE_CCITT}])
LOC_MSG([ Macintosh PackBits algorithm: ${HAVE_PACKBITS}])
LOC_MSG([ LZW algorithm: ${HAVE_LZW}])
LOC_MSG([ ThunderScan 4-bit RLE algorithm: ${HAVE_THUNDER}])
LOC_MSG([ NeXT 2-bit RLE algorithm: ${HAVE_NEXT}])
LOC_MSG([ LogLuv high dynamic range encoding:${HAVE_LOGLUV}])
LOC_MSG([ CCITT Group 3 & 4 algorithms: ${HAVE_CCITT}])
LOC_MSG([ Macintosh PackBits algorithm: ${HAVE_PACKBITS}])
LOC_MSG([ LZW algorithm: ${HAVE_LZW}])
LOC_MSG([ ThunderScan 4-bit RLE algorithm: ${HAVE_THUNDER}])
LOC_MSG([ NeXT 2-bit RLE algorithm: ${HAVE_NEXT}])
LOC_MSG([ LogLuv high dynamic range encoding: ${HAVE_LOGLUV}])
LOC_MSG()
LOC_MSG([ Support for external codecs:])
LOC_MSG([ ZLIB support: ${HAVE_ZLIB}])
LOC_MSG([ Pixar log-format algorithm: ${HAVE_PIXARLOG}])
LOC_MSG([ JPEG support: ${HAVE_JPEG}])
LOC_MSG([ Old JPEG support: ${HAVE_OJPEG}])
LOC_MSG([ ZLIB support: ${HAVE_ZLIB}])
LOC_MSG([ Pixar log-format algorithm: ${HAVE_PIXARLOG}])
LOC_MSG([ JPEG support: ${HAVE_JPEG}])
LOC_MSG([ Old JPEG support: ${HAVE_OJPEG}])
LOC_MSG()
LOC_MSG([ C++ support: ${HAVE_CXX}])
LOC_MSG([ C++ support: ${HAVE_CXX}])
LOC_MSG()
LOC_MSG([ OpenGL support: ${HAVE_OPENGL}])
LOC_MSG([ OpenGL support: ${HAVE_OPENGL}])
LOC_MSG()

3
contrib/Makefile.in
View File

@ -123,11 +123,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/acorn/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/addtiffo/Makefile.in
View File

@ -137,11 +137,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/dbs/Makefile.in
View File

@ -155,11 +155,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

5
contrib/dbs/xtiff/Makefile.in
View File

@ -14,7 +14,7 @@
@SET_MAKE@
# $Id: Makefile.in,v 1.22 2005-03-17 14:49:52 dron Exp $
# $Id: Makefile.in,v 1.23 2005-03-22 10:36:43 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
@ -116,11 +116,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/iptcutil/Makefile.in
View File

@ -136,11 +136,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/mac-cw/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/mac-mpw/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/mfs/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/ojpeg/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/pds/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/ras/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/stream/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/tags/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
contrib/win_dib/Makefile.in
View File

@ -114,11 +114,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

5
html/Makefile.in
View File

@ -14,7 +14,7 @@
@SET_MAKE@
# $Id: Makefile.in,v 1.36 2005-03-17 14:49:52 dron Exp $
# $Id: Makefile.in,v 1.37 2005-03-22 10:36:44 dron Exp $
#
# Tag Image File Format (TIFF) Software
#
@ -136,11 +136,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
html/images/Makefile.in
View File

@ -125,11 +125,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
html/man/Makefile.in
View File

@ -125,11 +125,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

6
libtiff/Makefile.am
View File

@ -109,11 +109,17 @@ libtiff_la_SOURCES = $(SRCS)
libtiff_la_LDFLAGS = \
-no-undefined \
-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
if HAVE_RPATH
libtiff_la_LDFLAGS += $(LIBDIR)
endif
libtiffxx_la_SOURCES = $(SRCSXX)
libtiffxx_la_LDFLAGS = \
-no-undefined \
-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
if HAVE_RPATH
libtiffxx_la_LDFLAGS += $(LIBDIR)
endif
libtiffxx_la_LIBADD = $(LIBTIFF)
#

19
libtiff/Makefile.in
View File

@ -68,6 +68,8 @@ host_triplet = @host@
target_triplet = @target@
@HAVE_CXX_TRUE@am__append_1 = tiffio.hxx
@HAVE_CXX_TRUE@am__append_2 = libtiffxx.la
@HAVE_RPATH_TRUE@am__append_3 = $(LIBDIR)
@HAVE_RPATH_TRUE@am__append_4 = $(LIBDIR)
noinst_PROGRAMS = mkg3states$(EXEEXT)
subdir = libtiff
DIST_COMMON = $(am__libtiffinclude_HEADERS_DIST) $(noinst_HEADERS) \
@ -183,11 +185,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@
@ -340,15 +345,13 @@ libtiffinclude_HEADERS = $(HDRS)
noinst_HEADERS = $(EXTRA_HDRS)
lib_LTLIBRARIES = libtiff.la $(am__append_2)
libtiff_la_SOURCES = $(SRCS)
libtiff_la_LDFLAGS = \
-no-undefined \
-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
libtiff_la_LDFLAGS = -no-undefined -version-number \
$(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \
$(am__append_3)
libtiffxx_la_SOURCES = $(SRCSXX)
libtiffxx_la_LDFLAGS = \
-no-undefined \
-version-number $(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION)
libtiffxx_la_LDFLAGS = -no-undefined -version-number \
$(LIBTIFF_MAJOR_VERSION):$(LIBTIFF_MINOR_VERSION):$(LIBTIFF_MICRO_VERSION) \
$(am__append_4)
libtiffxx_la_LIBADD = $(LIBTIFF)
mkg3states_SOURCES = mkg3states.c tif_fax3.h
mkg3states_LDADD = $(LIBPORT)

3
man/Makefile.in
View File

@ -120,11 +120,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
port/Makefile.in
View File

@ -135,11 +135,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
test/Makefile.in
View File

@ -147,11 +147,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@

3
tools/Makefile.in
View File

@ -244,11 +244,14 @@ HAVE_CXX_FALSE = @HAVE_CXX_FALSE@
HAVE_CXX_TRUE = @HAVE_CXX_TRUE@
HAVE_OPENGL_FALSE = @HAVE_OPENGL_FALSE@
HAVE_OPENGL_TRUE = @HAVE_OPENGL_TRUE@
HAVE_RPATH_FALSE = @HAVE_RPATH_FALSE@
HAVE_RPATH_TRUE = @HAVE_RPATH_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBDIR = @LIBDIR@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTIFF_ALPHA_VERSION = @LIBTIFF_ALPHA_VERSION@