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) \
52 -I$(top_builddir)/gdk-pixbuf \
53 $(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
55 -AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
56 +AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loadersdir)\""
58 LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
60 --- gdk-pixbuf-0.16.0/doc/Makefile.am.wiget Mon Apr 15 19:09:12 2002
61 +++ gdk-pixbuf-0.16.0/doc/Makefile.am Mon Apr 15 19:11:27 2002
64 # echo '-- Installing $(srcdir)/html/index.sgml' ; \
65 # $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
69 # Require gtk-doc when making dist
70 --- gdk-pixbuf-0.16.0/configure.in.wiget Tue Apr 16 07:35:03 2002
71 +++ gdk-pixbuf-0.16.0/configure.in Tue Apr 16 08:05:48 2002
75 if test -z "$LIBTIFF"; then
76 - AC_CHECK_LIB(tiff, TIFFReadScanline,
77 - AC_CHECK_HEADER(tiffio.h,
78 - TIFF='tiff'; LIBTIFF='-ltiff',
79 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
80 - AC_CHECK_LIB(tiff, TIFFWriteScanline,
81 - AC_CHECK_HEADER(tiffio.h,
82 - TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
83 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
84 - AC_CHECK_LIB(tiff34, TIFFFlushData,
85 - AC_CHECK_HEADER(tiffio.h,
86 - TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
87 - AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
88 - AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
89 + AC_CHECK_LIB(tiff, TIFFReadScanline,[
90 + AC_CHECK_HEADER(tiffio.h,[
91 + TIFF='tiff'; LIBTIFF='-ltiff'
93 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
96 + AC_CHECK_LIB(tiff, TIFFWriteScanline,[
97 + AC_CHECK_HEADER(tiffio.h,[
98 + TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
100 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
103 + AC_CHECK_LIB(tiff34, TIFFFlushData,[
104 + AC_CHECK_HEADER(tiffio.h,[
105 + TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
107 + AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
110 + AC_MSG_WARN([*** TIFF plug-in will not be built (TIFF library not found) ***])
123 if test -z "$LIBJPEG"; then
124 - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
126 + AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[
130 - AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
131 + AC_MSG_WARN([*** JPEG loader will not be built (JPEG library not found) ***])
133 if test "$jpeg_ok" = yes; then
134 AC_MSG_CHECKING([for jpeglib.h])
136 @@ -175,41 +195,47 @@
139 #include <jpeglib.h>],
142 - AC_MSG_RESULT($jpeg_ok)
145 + AC_MSG_RESULT([$jpeg_ok])
146 if test "$jpeg_ok" = yes; then
148 - AC_CHECK_LIB(jpeg, jpeg_simple_progression,
149 - AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
150 - AC_MSG_WARN(JPEG library does not support progressive saving.))
151 + AC_CHECK_LIB(jpeg, jpeg_simple_progression,[
152 + AC_DEFINE(HAVE_PROGRESSIVE_JPEG)
154 + AC_MSG_WARN([JPEG library does not support progressive saving.])
157 - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
158 + AC_MSG_WARN([*** JPEG loader will not be built (JPEG header file not found) ***])
164 if test -z "$LIBPNG"; then
165 - AC_CHECK_LIB(png, png_read_info,
166 - AC_CHECK_HEADER(png.h,
169 - AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
170 + AC_CHECK_LIB(png, png_read_info,[
171 + AC_CHECK_HEADER(png.h,[
177 + AC_MSG_WARN([*** PNG loader will not be built (PNG library not found) ***])
179 if test "$png_ok" = yes; then
180 AC_MSG_CHECKING([for png_structp in png.h])
181 AC_TRY_COMPILE([#include <png.h>],
182 [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
185 - AC_MSG_RESULT($png_ok)
188 + AC_MSG_RESULT([$png_ok])
189 if test "$png_ok" = yes; then
190 PNG='png'; LIBPNG='-lpng -lz'
192 - AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
193 + AC_MSG_WARN([*** PNG loader will not be built (PNG library is too old) ***])
196 - AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
197 + AC_MSG_WARN([*** PNG loader will not be built (PNG header file not found) ***])