Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@src.gnome.org>2005-04-26 08:12:34 (GMT)
committer Nickolay V. Shmyrev <nshmyrev@src.gnome.org>2005-04-26 08:12:34 (GMT)
commit2ba128683e2383e7cca98082353f3f632cbf40f3 (patch)
tree3c15616e3851d2c6c16cd998b6f5d6ac0116a7bb
parentc5e889301ed8ef25b628231b6bf897eaf549e941 (diff)
Fix for 301996
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac2
-rw-r--r--shell/Makefile.am4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e1f6c2f..655bc28 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 9848a20..0d6ed51 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 c7181a5..f9ef2f4 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 \