aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h.in3
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac5
3 files changed, 6 insertions, 10 deletions
diff --git a/config.h.in b/config.h.in
index 165d8766..1393c5a6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -53,9 +53,6 @@
/* Define to 1 if libPNG is available */
#undef HAVE_LIBPNG
-/* Define to 1 if you have the `tiff' library (-ltiff). */
-#undef HAVE_LIBTIFF
-
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#undef HAVE_MALLOC
diff --git a/configure b/configure
index 9f06a509..6ffb56bc 100755
--- a/configure
+++ b/configure
@@ -7043,14 +7043,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFOpen" >&5
$as_echo "$ac_cv_lib_tiff_TIFFOpen" >&6; }
if test "x$ac_cv_lib_tiff_TIFFOpen" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTIFF 1
-_ACEOF
- LIBS="-ltiff $LIBS"
+ have_libtiff=true
+ LIBTIFF_LIBS="-ltiff"
-else
- have_libtiff=true
fi
diff --git a/configure.ac b/configure.ac
index c9f410da..e89dd096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,10 @@ AS_IF([test "x$enable_tiff" != "xno"],
LIBTIFF_LIBS="-L$withval/lib -ltiff"
have_libtiff=true
], [
- AC_CHECK_LIB([tiff], [TIFFOpen], [], [have_libtiff=true])
+ AC_CHECK_LIB([tiff], [TIFFOpen], [
+ have_libtiff=true
+ LIBTIFF_LIBS="-ltiff"
+ ])
])
], [
AC_MSG_RESULT([no])