From: Nickolay V. Shmyrev <nshmyrev@src.gnome.org>
Date: Tue, 26 Apr 2005 08:12:34 +0000 (+0000)
Subject: Fix for 301996
X-Git-Tag: EVINCE_0_3_0~25
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=2ba128683e2383e7cca98082353f3f632cbf40f3;p=evince.git

Fix for 301996
---

diff --git a/ChangeLog b/ChangeLog
index e1f6c2f1..655bc289 100644
--- 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 9848a20f..0d6ed512 100644
--- 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 c7181a5c..f9ef2f4c 100644
--- 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			\