? aclocal.m4 ? autom4te.cache ? config.h.in-autoheader ? lib/.Makefile.in.swp ? lib/pdf/Makefile ? lib/pdf/xpdf-3.02 ? lib/pdf/xpdf-3.02.tar.gz ? lib/readers/Makefile ? pdf2swf/fonts/Makefile Index: config.h.in =================================================================== RCS file: /cvsroot/swftools/swftools/config.h.in,v retrieving revision 1.37 diff -u -3 -p -r1.37 config.h.in --- config.h.in 8 May 2008 08:14:16 -0000 1.37 +++ config.h.in 10 Jul 2008 22:53:56 -0000 @@ -147,6 +147,15 @@ /* Define if you have the z library (-lz). */ #undef HAVE_LIBZ +/* use internal libart library */ +#undef HAVE_LIBART + +/* Define to 1 if you have the `art_lgpl_2' library (-lart_lgpl_2). */ +#undef HAVE_LIBART_LGPL_2 + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBART_LGPL_LIBART_H + /* Name of package */ #undef PACKAGE Index: configure.in =================================================================== RCS file: /cvsroot/swftools/swftools/configure.in,v retrieving revision 1.128 diff -u -3 -p -r1.128 configure.in --- configure.in 8 Jul 2008 09:28:01 -0000 1.128 +++ configure.in 10 Jul 2008 22:53:56 -0000 @@ -19,6 +19,8 @@ AC_ARG_ENABLE(optimizations, [ --enable-optimizations turn on compiler optimizations (recommended for avi2swf)], OPTIMIZE=true) AC_ARG_ENABLE(lame, [ --disable-lame don't compile any L.A.M.E. mp3 encoding code in], DISABLE_LAME=true) +AC_ARG_WITH([external-libart], +[ --with-external-libart use external libart library (at your own risk)], [EXTERNAL_LIBART=true]) PACKAGE=swftools VERSION=2008-06-23-2005 @@ -287,6 +289,24 @@ else fi AC_SUBST(lame_in_source) +art_in_source='$(art_objects)' +AC_DEFINE([HAVE_LIBART], [1], [use internal libart library]) + +if test "x$EXTERNAL_LIBART" = "xtrue"; then + art_in_source= + PKG_CHECK_MODULES([LIBART],[libart-2.0],,[libart_pkgconfig_libart=no]) + if test "x$libart_pkgconfig_libart" = "xno"; then + AC_CHECK_HEADERS([libart_lgpl/libart.h],[ + AC_CHECK_LIB([art_lgpl_2],[art_new],,[]) + ],[AC_MSG_ERROR([No libart library found. This library is required.])]) + else + CPPFLAGS="$CPPFLAGS $LIBART_CFLAGS" + AC_DEFINE([HAVE_LIBART], [0]) + LIBS="$LIBS $LIBART_LIBS" + fi +fi +AC_SUBST([art_in_source]) + # ------------------------------------------------------------------ RFX_CHECK_AVI2SWF Index: lib/Makefile.in =================================================================== RCS file: /cvsroot/swftools/swftools/lib/Makefile.in,v retrieving revision 1.82 diff -u -3 -p -r1.82 Makefile.in --- lib/Makefile.in 8 Jul 2008 09:27:11 -0000 1.82 +++ lib/Makefile.in 10 Jul 2008 22:53:56 -0000 @@ -12,11 +12,19 @@ lame_objects = lame/psymodel.$(O) lame/f lame_in_source = @lame_in_source@ h263_objects = h.263/dct.$(O) h.263/h263tables.$(O) h.263/swfvideo.$(O) + +#actioncompiler_in_source = @actioncompiler_in_source@ +actioncompiler_in_source = $(actioncompiler_objects) + actioncompiler_objects = action/assembler.$(O) action/compile.$(O) action/lex.swf4.$(O) action/lex.swf5.$(O) action/libming.$(O) action/swf4compiler.tab.$(O) action/swf5compiler.tab.$(O) action/actioncompiler.$(O) + rfxswf_modules = modules/swfbits.c modules/swfaction.c modules/swfdump.c modules/swfcgi.c modules/swfbutton.c modules/swftext.c modules/swffont.c modules/swftools.c modules/swfsound.c modules/swfshape.c modules/swfobject.c modules/swfdraw.c modules/swffilter.c modules/swfrender.c h.263/swfvideo.c base_objects=q.$(O) utf8.$(O) png.$(O) jpeg.$(O) wav.$(O) mp3.$(O) os.$(O) bitio.$(O) log.$(O) mem.$(O) gfx_objects=gfxtools.$(O) gfxfont.$(O) gfxpoly.$(O) devices/dummy.$(O) devices/file.$(O) devices/render.$(O) devices/text.$(O) devices/record.$(O) devices/ops.$(O) devices/polyops.$(O) devices/bbox.$(O) devices/rescale.$(O) + +art_in_source = @art_in_source@ + art_objects=art/art_affine.$(O) art/art_alphagamma.$(O) art/art_bpath.$(O) art/art_gray_svp.$(O) art/art_misc.$(O) art/art_pixbuf.$(O) art/art_rect.$(O) art/art_rect_svp.$(O) art/art_rect_uta.$(O) art/art_render.$(O) art/art_render_gradient.$(O) art/art_render_mask.$(O) art/art_render_svp.$(O) art/art_rgb.$(O) art/art_rgb_a_affine.$(O) art/art_rgb_affine.$(O) art/art_rgb_affine_private.$(O) art/art_rgb_bitmap_affine.$(O) art/art_rgb_pixbuf_affine.$(O) art/art_rgb_rgba_affine.$(O) art/art_rgb_svp.$(O) art/art_rgba.$(O) art/art_svp.$(O) art/art_svp_intersect.$(O) art/art_svp_ops.$(O) art/art_svp_point.$(O) art/art_svp_render_aa.$(O) art/art_svp_vpath.$(O) art/art_svp_vpath_stroke.$(O) art/art_svp_wind.$(O) art/art_uta.$(O) art/art_uta_ops.$(O) art/art_uta_rect.$(O) art/art_uta_svp.$(O) art/art_uta_vpath.$(O) art/art_vpath.$(O) art/art_vpath_bpath.$(O) art/art_vpath_dash.$(O) art/art_vpath_svp.$(O) rfxswf_objects=modules/swfabc.$(O) modules/swfaction.$(O) modules/swfbits.$(O) modules/swfbutton.$(O) modules/swfcgi.$(O) modules/swfdraw.$(O) modules/swfdump.$(O) modules/swffilter.$(O) modules/swffont.$(O) modules/swfobject.$(O) modules/swfrender.$(O) modules/swfshape.$(O) modules/swfsound.$(O) modules/swftext.$(O) modules/swftools.$(O) ocr_objects=gocr/box.$(O) gocr/database.$(O) gocr/detect.$(O) gocr/job.$(O) gocr/lines.$(O) gocr/list.$(O) gocr/ocr0.$(O) gocr/ocr0n.$(O) gocr/ocr1.$(O) gocr/otsu.$(O) gocr/output.$(O) gocr/pgm2asc.$(O) gocr/pixel.$(O) gocr/progress.$(O) gocr/remove.$(O) gocr/unicode.$(O) @@ -145,11 +153,11 @@ libbase$(A): $(base_objects) Makefile libgfxswf$(A): devices/swf.$(O) readers/swf2.$(O) readers/image.$(O) $(AR) r libgfxswf$(A) devices/swf.$(O) readers/swf2.$(O) readers/image.$(O) -libgfx$(A): $(gfx_objects) $(art_objects) Makefile - $(AR) r libgfx$(A) $(gfx_objects) $(art_objects) +libgfx$(A): $(gfx_objects) $(art_in_source) Makefile + $(AR) r libgfx$(A) $(gfx_objects) $(art_in_source) -librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_objects) Makefile - $(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_objects) +librfxswf$(A): Makefile $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_in_source) Makefile + $(AR) r librfxswf$(A) $(rfxswf_objects) rfxswf.$(O) drawer.$(O) MD5.$(O) $(lame_in_source) $(h263_objects) $(actioncompiler_in_source) $(RANLIB) librfxswf$(A) libpdf$(A): pdf/GFXOutputDev.cc pdf/GFXOutputDev.h pdf/pdf.cc pdf/pdf.h Index: lib/gfxpoly.c =================================================================== RCS file: /cvsroot/swftools/swftools/lib/gfxpoly.c,v retrieving revision 1.9 diff -u -3 -p -r1.9 gfxpoly.c --- lib/gfxpoly.c 24 May 2008 15:18:39 -0000 1.9 +++ lib/gfxpoly.c 10 Jul 2008 22:53:56 -0000 @@ -25,9 +25,15 @@ #include "gfxtools.h" #include "gfxpoly.h" #include "mem.h" +#ifdef HAVE_LIBART #include "art/libart.h" #include "art/art_svp_intersect.h" #include "art/art_svp_ops.h" +#else +#include +#include +#include +#endif #include "log.h" #include #include Index: lib/devices/swf.c =================================================================== RCS file: /cvsroot/swftools/swftools/lib/devices/swf.c,v retrieving revision 1.60 diff -u -3 -p -r1.60 swf.c --- lib/devices/swf.c 19 Jun 2008 20:30:07 -0000 1.60 +++ lib/devices/swf.c 10 Jul 2008 22:53:57 -0000 @@ -40,7 +40,11 @@ #include "../rfxswf.h" #include "../gfxdevice.h" #include "../gfxtools.h" +#ifdef HAVE_LIBART #include "../art/libart.h" +#else +#include +#endif #include "swf.h" #include "../gfxpoly.h" #include "../png.h"