1 --- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.orig Fri Jan 4 03:54:48 2002
2 +++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am Sat Jan 26 08:02:06 2002
4 gdk-pixbuf-parse-color.c \
7 -libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
8 +libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS)
9 libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
12 --- gdk-pixbuf-0.11.0/configure.in.orig Thu Apr 26 21:46:16 2001
13 +++ gdk-pixbuf-0.11.0/configure.in Fri Oct 19 22:38:48 2001
21 dnl Initialize maintainer mode
22 --- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.wiget Mon Apr 15 19:06:40 2002
23 +++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am Mon Apr 15 19:08:31 2002
26 libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
28 -libexecdir = $(libdir)/gdk-pixbuf/loaders
29 +loadersdir = $(libdir)/gdk-pixbuf/loaders
35 if BUILD_DYNAMIC_MODULES
37 -libexec_LTLIBRARIES = \
38 +loaders_LTLIBRARIES = \
46 -libexec_LTLIBRARIES =
47 +loaders_LTLIBRARIES =
49 extra_sources = $(libpixbufloader_png_la_SOURCES) \
50 $(libpixbufloader_jpeg_la_SOURCES) \
51 --- gdk-pixbuf-0.16.0/doc/Makefile.am.wiget Mon Apr 15 19:09:12 2002
52 +++ gdk-pixbuf-0.16.0/doc/Makefile.am Mon Apr 15 19:11:27 2002
55 # echo '-- Installing $(srcdir)/html/index.sgml' ; \
56 # $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
60 # Require gtk-doc when making dist
61 --- gdk-pixbuf-0.16.0/configure.in.wiget Tue Apr 16 07:35:03 2002
62 +++ gdk-pixbuf-0.16.0/configure.in Tue Apr 16 08:05:48 2002
66 if test -z "$LIBTIFF"; then
67 - AC_CHECK_LIB(tiff, TIFFReadScanline,
68 - AC_CHECK_HEADER(tiffio.h,
69 - TIFF='tiff'; LIBTIFF='-ltiff',
70 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
71 - AC_CHECK_LIB(tiff, TIFFWriteScanline,
72 - AC_CHECK_HEADER(tiffio.h,
73 - TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
74 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
75 - AC_CHECK_LIB(tiff34, TIFFFlushData,
76 - AC_CHECK_HEADER(tiffio.h,
77 - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
78 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
79 - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
80 + AC_CHECK_LIB(tiff, TIFFReadScanline,[
81 + AC_CHECK_HEADER(tiffio.h,[
82 + TIFF='tiff'; LIBTIFF='-ltiff'
84 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
87 + AC_CHECK_LIB(tiff, TIFFWriteScanline,[
88 + AC_CHECK_HEADER(tiffio.h,[
89 + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
91 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
94 + AC_CHECK_LIB(tiff34, TIFFFlushData,[
95 + AC_CHECK_HEADER(tiffio.h,[
96 + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
98 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
101 + AC_MSG_WARN([*** TIFF plug-in will not be built (TIFF library not found) ***])
114 if test -z "$LIBJPEG"; then
115 - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
117 + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[
121 - AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
122 + AC_MSG_WARN([*** JPEG loader will not be built (JPEG library not found) ***])
124 if test "$jpeg_ok" = yes; then
125 AC_MSG_CHECKING([for jpeglib.h])
127 @@ -175,41 +195,47 @@
130 #include <jpeglib.h>],
133 - AC_MSG_RESULT($jpeg_ok)
136 + AC_MSG_RESULT([$jpeg_ok])
137 if test "$jpeg_ok" = yes; then
139 - AC_CHECK_LIB(jpeg, jpeg_simple_progression,
140 - AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
141 - AC_MSG_WARN(JPEG library does not support progressive saving.))
142 + AC_CHECK_LIB(jpeg, jpeg_simple_progression,[
143 + AC_DEFINE(HAVE_PROGRESSIVE_JPEG)
145 + AC_MSG_WARN([JPEG library does not support progressive saving.])
148 - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
149 + AC_MSG_WARN([*** JPEG loader will not be built (JPEG header file not found) ***])
155 if test -z "$LIBPNG"; then
156 - AC_CHECK_LIB(png, png_read_info,
157 - AC_CHECK_HEADER(png.h,
160 - AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
161 + AC_CHECK_LIB(png, png_read_info,[
162 + AC_CHECK_HEADER(png.h,[
168 + AC_MSG_WARN([*** PNG loader will not be built (PNG library not found) ***])
170 if test "$png_ok" = yes; then
171 AC_MSG_CHECKING([for png_structp in png.h])
172 AC_TRY_COMPILE([#include <png.h>],
173 [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
176 - AC_MSG_RESULT($png_ok)
179 + AC_MSG_RESULT([$png_ok])
180 if test "$png_ok" = yes; then
181 PNG='png'; LIBPNG='-lpng -lz'
183 - AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
184 + AC_MSG_WARN([*** PNG loader will not be built (PNG library is too old) ***])
187 - AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
188 + AC_MSG_WARN([*** PNG loader will not be built (PNG header file not found) ***])
192 --- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.wiget2 Tue Apr 16 13:00:48 2002
193 +++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am Tue Apr 16 13:01:22 2002
195 -I$(top_builddir)/gdk-pixbuf \
196 $(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
198 -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
199 +AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loadersdir)\""
201 LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)