Commit 7b9851a7 authored by Enrico Ros's avatar Enrico Ros

applying patch_099,100

svn path=/branches/kpdf/annotations/kdegraphics/kpdf/; revision=425006
parent bc71e24b
......@@ -53,20 +53,6 @@ if test -z "$XFT_LIBS"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
fi
dnl ##### Check for libjpeg
AC_CHECK_LIB([jpeg], [jpeg_destroy_decompress],HAVE_LIBJPEG=yes,HAVE_LIBJPEG=no)
if test "$HAVE_LIBJPEG" = "yes"; then
AC_CHECK_HEADERS([jpeglib.h],,HAVE_LIBJPEG=no)
fi
if test "$HAVE_LIBJPEG" = "yes"; then
LIBJPEG_LIBS="-ljpeg"
AC_SUBST(LIBJPEG_LIBS)
else
DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
fi
dnl ##### Check for libpaper (Debian).
LIBPAPER_LIBS=
KDE_CHECK_HEADER(paper.h, [
......
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) $(LIBJPEG_LIBS) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
FontEncodingTables.cc FlateStream.cc Function.cc Gfx.cc \
......
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