Fix for 301996

diff --git a/ChangeLog b/ChangeLog
index e1f6c2f125f35ad8d0765acadca0cfb2c981dd58..655bc289b0888dcc5fdfdc24cceada3062c80a8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-26  Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+       
+       * shell/Makefile.am, configure.ac: Fix build problems
+       with t1lib. Bug 301996.
+
 2005-04-25  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
 
        * shell/ev-view.c: (ev_view_scroll_event):

diff --git a/configure.ac b/configure.ac
index 9848a20f5fa4d4c079ab991fae5fe87e9e01c818..0d6ed51251fb1ce2362594534fb27f3f1d17f013 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,8 @@ if test "x$enable_dvi" = "xyes"; then
     if test "x$enable_type1_fonts" = xyes; then
         AC_DEFINE([WITH_TYPE1_FONTS], [1], [Enable t1lib support in dvi.])
     fi
+else 
+    enable_type1_fonts=no
 fi
 AM_CONDITIONAL(WITH_TYPE1_FONTS, test x$enable_type1_fonts = xyes)
 

diff --git a/shell/Makefile.am b/shell/Makefile.am
index c7181a5ca16a91a2d1d6606066dc392f33b62c3e..f9ef2f4cbe3451f96aaec96c6d10b6372fb56d92 100644 (file)
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -43,10 +43,6 @@ libevbackendfactory_la_LIBADD +=             \
        $(NULL)
 endif
 
-if WITH_TYPE1_FONTS
-libevbackendfactory_la_LIBADD += -lt1lib
-endif
-
 evince_SOURCES=                                \
        dummy.cc                        \
        eggfindbar.c                    \