From: Enlightenment C. <no...@cv...> - 2007-09-29 20:03:15
|
Enlightenment CVS committal Author : doursse Project : e17 Module : proto/epdf Dir : e17/proto/epdf Modified Files: ChangeLog configure.in Log Message: * configure.in: * src/lib/poppler_document.cpp: * src/lib/poppler_index.cpp: * src/lib/poppler_page.cpp: * src/lib/poppler_page_transition.cpp: * src/lib/poppler_postscript.cpp: support poppler 0.6 and 0.5.4. * src/lib/etk_pdf.c: (etk_pdf_type_get): adding NULL to the last parameter of etk_type_new. I don't know if it's the correct value as there's no doc about that param, but it seems to work. =================================================================== RCS file: /cvs/e/e17/proto/epdf/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ChangeLog 19 Sep 2007 16:07:44 -0000 1.5 +++ ChangeLog 29 Sep 2007 20:02:41 -0000 1.6 @@ -1,3 +1,18 @@ +2007-09-29 Vincent Torri <doursse at users dot sf dot net> + + * configure.in: + * src/lib/poppler_document.cpp: + * src/lib/poppler_index.cpp: + * src/lib/poppler_page.cpp: + * src/lib/poppler_page_transition.cpp: + * src/lib/poppler_postscript.cpp: + support poppler 0.6 and 0.5.4. + + * src/lib/etk_pdf.c: (etk_pdf_type_get): + adding NULL to the last parameter of etk_type_new. I don't + know if it's the correct value as there's no doc about that + param, but it seems to work. + 2007-09-19 Michael Lauer <mickey at vanille-media dot de> * src/lib/poppler_page.cpp: (epdf_page_text_get): =================================================================== RCS file: /cvs/e/e17/proto/epdf/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in 30 Aug 2007 08:16:26 -0000 1.10 +++ configure.in 29 Sep 2007 20:02:41 -0000 1.11 @@ -11,14 +11,33 @@ AM_PROG_CC_C_O AC_PROG_CXX -poppler_version=0.5.9 evas_version=0.9.9 ecore_version=0.9.9 -PKG_CHECK_MODULES(EPDF, - poppler >= ${poppler_version} evas >= ${evas_version} ecore >= ${ecore_version}) +PKG_CHECK_MODULES(EFL, + [ evas >= ${evas_version} ecore >= ${ecore_version} ] +) + +PKG_CHECK_MODULES(POPPLER, [ poppler >= 0.6 ], + [ + have_poppler_0_6="yes" + AC_DEFINE([HAVE_POPPLER_0_6], [1], [Define to 1 if you have Poppler 0.6.]) + ], + [ have_poppler_0_6="no" ] +) +if test "x$have_poppler_0_6" = "xno"; then + PKG_CHECK_MODULES(POPPLER, [ poppler >= 0.5.4 ], + [ ], + [ AC_MSG_ERROR([No supported Poppler found.]) ] + ) +fi POPPLER_VERSION=`pkg-config --modversion poppler` AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["${POPPLER_VERSION}"], [Poppler version.]) + +EPDF_CFLAGS="$POPPLER_CFLAGS $EFL_CFLAGS" +EPDF_LIBS="$POPPLER_LIBS $EFL_LIBS" +AC_SUBST(EPDF_CFLAGS) +AC_SUBST(EPDF_LIBS) requirements="poppler evas ecore" |