From 40ae66301e43e8d0249b81e378c5bcd1213d86cc Mon Sep 17 00:00:00 2001 From: Andrey Kiselev Date: Tue, 22 Mar 2005 10:33:04 +0000 Subject: [PATCH] Use libtool machinery to pass rpath option. --- Makefile.in | 3 ++ configure | 77 +++++++++++++++++++++++------------ configure.ac | 56 +++++++++++++------------ contrib/Makefile.in | 3 ++ contrib/acorn/Makefile.in | 3 ++ contrib/addtiffo/Makefile.in | 3 ++ contrib/dbs/Makefile.in | 3 ++ contrib/dbs/xtiff/Makefile.in | 5 ++- contrib/iptcutil/Makefile.in | 3 ++ contrib/mac-cw/Makefile.in | 3 ++ contrib/mac-mpw/Makefile.in | 3 ++ contrib/mfs/Makefile.in | 3 ++ contrib/ojpeg/Makefile.in | 3 ++ contrib/pds/Makefile.in | 3 ++ contrib/ras/Makefile.in | 3 ++ contrib/stream/Makefile.in | 3 ++ contrib/tags/Makefile.in | 3 ++ contrib/win_dib/Makefile.in | 3 ++ html/Makefile.in | 5 ++- html/images/Makefile.in | 3 ++ html/man/Makefile.in | 3 ++ libtiff/Makefile.am | 6 +++ libtiff/Makefile.in | 19 +++++---- man/Makefile.in | 3 ++ port/Makefile.in | 3 ++ test/Makefile.in | 3 ++ tools/Makefile.in | 3 ++ 27 files changed, 168 insertions(+), 63 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6b70ca41..2499a976 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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@ diff --git a/configure b/configure index 383d3949..29976040 100755 --- a/configure +++ b/configure @@ -464,7 +464,7 @@ ac_includes_default="\ # include #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 "" diff --git a/configure.ac b/configure.ac index 0b679356..9ef56129 100644 --- a/configure.ac +++ b/configure.ac @@ -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() diff --git a/contrib/Makefile.in b/contrib/Makefile.in index f57bb041..8c7a0531 100644 --- a/contrib/Makefile.in +++ b/contrib/Makefile.in @@ -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@ diff --git a/contrib/acorn/Makefile.in b/contrib/acorn/Makefile.in index ac45695c..3afeb7ba 100644 --- a/contrib/acorn/Makefile.in +++ b/contrib/acorn/Makefile.in @@ -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@ diff --git a/contrib/addtiffo/Makefile.in b/contrib/addtiffo/Makefile.in index 9d5f24eb..321851d4 100644 --- a/contrib/addtiffo/Makefile.in +++ b/contrib/addtiffo/Makefile.in @@ -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@ diff --git a/contrib/dbs/Makefile.in b/contrib/dbs/Makefile.in index 18e152c2..780b5977 100644 --- a/contrib/dbs/Makefile.in +++ b/contrib/dbs/Makefile.in @@ -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@ diff --git a/contrib/dbs/xtiff/Makefile.in b/contrib/dbs/xtiff/Makefile.in index 459d72f6..a6a02339 100644 --- a/contrib/dbs/xtiff/Makefile.in +++ b/contrib/dbs/xtiff/Makefile.in @@ -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@ diff --git a/contrib/iptcutil/Makefile.in b/contrib/iptcutil/Makefile.in index 2a2fad29..d8f3f82a 100644 --- a/contrib/iptcutil/Makefile.in +++ b/contrib/iptcutil/Makefile.in @@ -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@ diff --git a/contrib/mac-cw/Makefile.in b/contrib/mac-cw/Makefile.in index c1fea659..ffddab3d 100644 --- a/contrib/mac-cw/Makefile.in +++ b/contrib/mac-cw/Makefile.in @@ -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@ diff --git a/contrib/mac-mpw/Makefile.in b/contrib/mac-mpw/Makefile.in index 6ed4badb..5a14f3eb 100644 --- a/contrib/mac-mpw/Makefile.in +++ b/contrib/mac-mpw/Makefile.in @@ -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@ diff --git a/contrib/mfs/Makefile.in b/contrib/mfs/Makefile.in index ef5118f9..de5b7e22 100644 --- a/contrib/mfs/Makefile.in +++ b/contrib/mfs/Makefile.in @@ -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@ diff --git a/contrib/ojpeg/Makefile.in b/contrib/ojpeg/Makefile.in index de5c975a..8c8220db 100644 --- a/contrib/ojpeg/Makefile.in +++ b/contrib/ojpeg/Makefile.in @@ -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@ diff --git a/contrib/pds/Makefile.in b/contrib/pds/Makefile.in index 8452c91d..f3f04b39 100644 --- a/contrib/pds/Makefile.in +++ b/contrib/pds/Makefile.in @@ -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@ diff --git a/contrib/ras/Makefile.in b/contrib/ras/Makefile.in index 15b5a61d..63b10b63 100644 --- a/contrib/ras/Makefile.in +++ b/contrib/ras/Makefile.in @@ -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@ diff --git a/contrib/stream/Makefile.in b/contrib/stream/Makefile.in index 5a53436e..a3058565 100644 --- a/contrib/stream/Makefile.in +++ b/contrib/stream/Makefile.in @@ -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@ diff --git a/contrib/tags/Makefile.in b/contrib/tags/Makefile.in index 98412b47..e9c778f0 100644 --- a/contrib/tags/Makefile.in +++ b/contrib/tags/Makefile.in @@ -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@ diff --git a/contrib/win_dib/Makefile.in b/contrib/win_dib/Makefile.in index 0b277cfd..629058c3 100644 --- a/contrib/win_dib/Makefile.in +++ b/contrib/win_dib/Makefile.in @@ -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@ diff --git a/html/Makefile.in b/html/Makefile.in index 5b60f165..17991ad5 100644 --- a/html/Makefile.in +++ b/html/Makefile.in @@ -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@ diff --git a/html/images/Makefile.in b/html/images/Makefile.in index d14dda9b..10ee4e49 100644 --- a/html/images/Makefile.in +++ b/html/images/Makefile.in @@ -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@ diff --git a/html/man/Makefile.in b/html/man/Makefile.in index 7c9f6aec..d014498f 100644 --- a/html/man/Makefile.in +++ b/html/man/Makefile.in @@ -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@ diff --git a/libtiff/Makefile.am b/libtiff/Makefile.am index e89b3522..93ba354c 100644 --- a/libtiff/Makefile.am +++ b/libtiff/Makefile.am @@ -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) # diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in index 61223245..54a91789 100644 --- a/libtiff/Makefile.in +++ b/libtiff/Makefile.in @@ -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) diff --git a/man/Makefile.in b/man/Makefile.in index 55587332..226ace66 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -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@ diff --git a/port/Makefile.in b/port/Makefile.in index bd57d209..4f271415 100644 --- a/port/Makefile.in +++ b/port/Makefile.in @@ -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@ diff --git a/test/Makefile.in b/test/Makefile.in index 77a6dd2e..88f5b19b 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -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@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 59141210..d9796cec 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -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@