Commit 7033b099 authored by Enrico Ros's avatar Enrico Ros
Browse files

applying patch_054,055

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=424915
parent 682ce0eb
......@@ -39,9 +39,11 @@ AC_SUBST(LIBFREETYPE_RPATH)
KDE_FIND_PATH(xft-config, XFT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin],)
if test -n "$XFT_CONFIG"; then
XFT_CFLAGS="`$XFT_CONFIG --cflags`"
XFT_LIBS="`$XFT_CONFIG --libs`"
fi
AC_SUBST(XFT_CFLAGS)
AC_SUBST(XFT_LIBS)
if test -z "$XFT_LIBS"; then
......
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
libxpdf_la_LDFLAGS = $(all_libraries)
libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
......
......@@ -25,6 +25,7 @@ class GList;
class GfxFont;
class GfxState;
class UnicodeMap;
class TextLineFrag;
//------------------------------------------------------------------------
......@@ -166,6 +167,8 @@ private:
// TextLine
//------------------------------------------------------------------------
class TextBlock;
class TextLine {
public:
......@@ -223,6 +226,8 @@ private:
// TextBlock
//------------------------------------------------------------------------
class TextPage;
class TextBlock {
public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment