]>
Commit | Line | Data |
---|---|---|
0cf209bf SS |
1 | --- abiword-2.8.1/plugins/garble/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 |
2 | +++ abiword-2.8.1/plugins/garble/Makefile.am 2010-02-05 17:05:16.644285818 +0100 | |
3 | @@ -8,7 +8,7 @@ plugin_LTLIBRARIES = garble.la | |
4 | ||
5 | garble_la_LIBADD = \ | |
6 | xp/libxp.la \ | |
7 | - $(GARBLE_LIBS) -lpng12 -ljpeg | |
8 | + $(GARBLE_LIBS) -lpng -ljpeg | |
9 | ||
10 | garble_la_LDFLAGS = \ | |
11 | $(GARBLE_LIBS) \ | |
12 | --- abiword-2.8.1/plugins/rsvg/Makefile.am.orig 2009-10-20 17:07:49.000000000 +0200 | |
13 | +++ abiword-2.8.1/plugins/rsvg/Makefile.am 2010-02-05 17:05:16.870953670 +0100 | |
14 | @@ -6,7 +6,7 @@ plugin_LTLIBRARIES = rsvg.la | |
15 | ||
16 | rsvg_la_LIBADD = \ | |
17 | xp/libxp.la \ | |
18 | - $(RSVG_LIBS) -lpng12 | |
19 | + $(RSVG_LIBS) -lpng | |
20 | ||
21 | rsvg_la_LDFLAGS = \ | |
22 | -avoid-version \ | |
23 | --- abiword-2.8.1/plugin-configure.m4.orig 2010-02-05 17:05:54.863451295 +0100 | |
24 | +++ abiword-2.8.1/plugin-configure.m4 2010-02-05 17:06:05.057616795 +0100 | |
25 | @@ -1553,7 +1553,7 @@ if test "$enable_bmp" == "yes" || \ | |
26 | # TODO check for libpng, well abiword links to it anyways | |
27 | ||
28 | BMP_CFLAGS="$BMP_CFLAGS "'${PLUGIN_CFLAGS}' | |
29 | -BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng12' | |
30 | +BMP_LIBS="$BMP_LIBS "'${PLUGIN_LIBS} -lpng' | |
31 | ||
32 | if test "$enable_bmp_builtin" == "yes"; then | |
33 | BMP_CFLAGS="$BMP_CFLAGS -DABI_PLUGIN_BUILTIN" |