Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac6
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a8cf008..5df13cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-17 Daniel Gryniewicz <dang@gentoo.org >
+
+ * configure.ac:
+
+ Don't link with ltiff if tiff is disabled.
+
2005-10-14 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
* pdf/GDKSplashOutputDev.cc:
diff --git a/configure.ac b/configure.ac
index b280ed3..3fd1e9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,12 +81,12 @@ if test "x$enable_dbus" = "xyes" ; then
fi
SHELL_CFLAGS="$SHELL_CORE_CFLAGS $DBUS_CFLAGS"
-SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -ltiff -lz"
+SHELL_LIBS="$SHELL_CORE_LIBS $DBUS_LIBS -lz"
AC_SUBST(SHELL_CFLAGS)
AC_SUBST(SHELL_LIBS)
FRONTEND_CFLAGS="$FRONTEND_CORE_CFLAGS"
-FRONTEND_LIBS="$FRONTEND_CORE_LIBS -ltiff -lz"
+FRONTEND_LIBS="$FRONTEND_CORE_LIBS -lz"
AC_SUBST(FRONTEND_CFLAGS)
AC_SUBST(FRONTEND_LIBS)
@@ -176,6 +176,8 @@ if test "x$enable_tiff" = "xyes"; then
fi
if test "x$enable_tiff" = "xyes"; then
AC_DEFINE([ENABLE_TIFF], [1], [Enable multipage tiff support.])
+ FRONTEND_LIBS="$FRONTEND_LIBS -ltiff"
+ SHELL_LIBS="$SHELL_LIBS -ltiff"
else
AC_MSG_WARN("Tiff support is disabled since tiff library version 3.6 or newer not found")
fi