[packages/gdk-pixbuf.git] / gdk-pixbuf-am.patch

--- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.orig	Fri Jan  4 03:54:48 2002
+++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am	Sat Jan 26 08:02:06 2002
@@ -211,7 +211,7 @@
 	gdk-pixbuf-parse-color.c	\
 	$(extra_sources)
 
-libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
+libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS)
 libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
 
 
--- gdk-pixbuf-0.11.0/configure.in.orig	Thu Apr 26 21:46:16 2001
+++ gdk-pixbuf-0.11.0/configure.in	Fri Oct 19 22:38:48 2001
@@ -25,6 +25,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
+AM_PROG_AS
 AC_PATH_XTRA
 
 dnl  Initialize maintainer mode
--- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.wiget	Mon Apr 15 19:06:40 2002
+++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am	Mon Apr 15 19:08:31 2002
@@ -18,7 +18,7 @@
 
 libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
 
-libexecdir = $(libdir)/gdk-pixbuf/loaders
+loadersdir = $(libdir)/gdk-pixbuf/loaders
 
 #
 # The PNG plugin.
@@ -118,7 +118,7 @@
 
 if BUILD_DYNAMIC_MODULES
 
-libexec_LTLIBRARIES = 	\
+loaders_LTLIBRARIES = 	\
 	$(PNG_LIB)	\
 	$(JPEG_LIB)	\
 	$(GIF_LIB)	\
@@ -134,7 +134,7 @@
 extra_sources = 
 
 else
-libexec_LTLIBRARIES = 
+loaders_LTLIBRARIES = 
 
 extra_sources = $(libpixbufloader_png_la_SOURCES) 	\
 		$(libpixbufloader_jpeg_la_SOURCES) 	\
--- gdk-pixbuf-0.16.0/doc/Makefile.am.wiget	Mon Apr 15 19:09:12 2002
+++ gdk-pixbuf-0.16.0/doc/Makefile.am	Mon Apr 15 19:11:27 2002
@@ -157,6 +157,7 @@
 	fi)
 #	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
 #	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+#
 
 #
 # Require gtk-doc when making dist
--- gdk-pixbuf-0.16.0/configure.in.wiget	Tue Apr 16 07:35:03 2002
+++ gdk-pixbuf-0.16.0/configure.in	Tue Apr 16 08:05:48 2002
@@ -147,27 +147,47 @@
 
 dnl Test for libtiff
   if test -z "$LIBTIFF"; then
-    AC_CHECK_LIB(tiff, TIFFReadScanline,
-      AC_CHECK_HEADER(tiffio.h,
-        TIFF='tiff'; LIBTIFF='-ltiff',
-        AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-      AC_CHECK_LIB(tiff, TIFFWriteScanline,
-        AC_CHECK_HEADER(tiffio.h,
-          TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz',
-          AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-        AC_CHECK_LIB(tiff34, TIFFFlushData,
-          AC_CHECK_HEADER(tiffio.h,
-            TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz',
-            AC_MSG_WARN(*** TIFF loader will not be built (TIFF header files not found) ***)),
-        AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm), -ljpeg -lz -lm), -lm)
+    AC_CHECK_LIB(tiff, TIFFReadScanline,[
+      AC_CHECK_HEADER(tiffio.h,[
+        TIFF='tiff'; LIBTIFF='-ltiff'
+      ],[
+        AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
+      ])
+    ],[
+      AC_CHECK_LIB(tiff, TIFFWriteScanline,[
+        AC_CHECK_HEADER(tiffio.h,[
+          TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
+	],[
+          AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
+	])
+      ],[
+        AC_CHECK_LIB(tiff34, TIFFFlushData,[
+          AC_CHECK_HEADER(tiffio.h,[
+            TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
+	  ],[
+            AC_MSG_WARN([*** TIFF loader will not be built (TIFF header files not found) ***])
+	  ])
+	],[
+            AC_MSG_WARN([*** TIFF plug-in will not be built (TIFF library not found) ***])
+	],[
+          -ljpeg -lz -lm
+	])
+      ],[
+        -ljpeg -lz -lm
+      ])
+    ],[
+      -lm
+    ])
   fi
 
 dnl Test for libjpeg
   if test -z "$LIBJPEG"; then
-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-      jpeg_ok=yes,
+    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[
+      jpeg_ok=yes
+     ],[
       jpeg_ok=no
-      AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
+      AC_MSG_WARN([*** JPEG loader will not be built (JPEG library not found) ***])
+     ])
     if test "$jpeg_ok" = yes; then
       AC_MSG_CHECKING([for jpeglib.h])
       AC_TRY_CPP(
@@ -175,41 +195,47 @@
 #undef PACKAGE
 #undef VERSION
 #include <jpeglib.h>],
-        jpeg_ok=yes,
-        jpeg_ok=no)
-      AC_MSG_RESULT($jpeg_ok)
+        [jpeg_ok=yes],
+        [jpeg_ok=no])
+      AC_MSG_RESULT([$jpeg_ok])
       if test "$jpeg_ok" = yes; then
         LIBJPEG='-ljpeg'
-        AC_CHECK_LIB(jpeg, jpeg_simple_progression,     
-          AC_DEFINE(HAVE_PROGRESSIVE_JPEG),
-          AC_MSG_WARN(JPEG library does not support progressive saving.))
+        AC_CHECK_LIB(jpeg, jpeg_simple_progression,[     
+          AC_DEFINE(HAVE_PROGRESSIVE_JPEG)
+	 ],[
+          AC_MSG_WARN([JPEG library does not support progressive saving.])
+	 ])
       else
-          AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
+          AC_MSG_WARN([*** JPEG loader will not be built (JPEG header file not found) ***])
       fi
     fi
   fi
 
 dnl Test for libpng
   if test -z "$LIBPNG"; then
-    AC_CHECK_LIB(png, png_read_info,
-      AC_CHECK_HEADER(png.h,
-        png_ok=yes,
-        png_ok=no),
-      AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
+    AC_CHECK_LIB(png, png_read_info,[
+      AC_CHECK_HEADER(png.h,[
+        png_ok=yes
+       ],[
+        png_ok=no
+       ])
+      ],[
+        AC_MSG_WARN([*** PNG loader will not be built (PNG library not found) ***])
+      ],[ -lz -lm])
     if test "$png_ok" = yes; then
       AC_MSG_CHECKING([for png_structp in png.h])
       AC_TRY_COMPILE([#include <png.h>],
         [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
-        png_ok=yes,
-        png_ok=no)
-      AC_MSG_RESULT($png_ok)
+        [png_ok=yes],
+        [png_ok=no])
+      AC_MSG_RESULT([$png_ok])
       if test "$png_ok" = yes; then
         PNG='png'; LIBPNG='-lpng -lz'
       else
-        AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
+        AC_MSG_WARN([*** PNG loader will not be built (PNG library is too old) ***])
       fi
     else
-     AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
+     AC_MSG_WARN([*** PNG loader will not be built (PNG header file not found) ***])
     fi
   fi
 
--- gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am.wiget2	Tue Apr 16 13:00:48 2002
+++ gdk-pixbuf-0.16.0/gdk-pixbuf/Makefile.am	Tue Apr 16 13:01:22 2002
@@ -159,7 +159,7 @@
 	-I$(top_builddir)/gdk-pixbuf \
 	$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
 
-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loadersdir)\""
 
 LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
Commit	Line	Data
c3f3b65c	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
	3	@@ -211,7 +211,7 @@
8c0cbd70 AM	4	gdk-pixbuf-parse-color.c \
	5	$(extra_sources)
	6
	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)
c3f3b65c	9	libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
8c0cbd70 AM	10
8c0cbd70 AM	11
0fd24fba JB	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
	14	@@ -25,6 +25,7 @@
	15	AC_PROG_LN_S
	16	AC_PROG_MAKE_SET
	17	AC_PROG_CPP
	18	+AM_PROG_AS
	19	AC_PATH_XTRA
	20
	21	dnl Initialize maintainer mode
7738300c AF	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
	24	@@ -18,7 +18,7 @@
	25
	26	libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS)
	27
	28	-libexecdir = $(libdir)/gdk-pixbuf/loaders
	29	+loadersdir = $(libdir)/gdk-pixbuf/loaders
	30
	31	#
	32	# The PNG plugin.
	33	@@ -118,7 +118,7 @@
	34
	35	if BUILD_DYNAMIC_MODULES
	36
	37	-libexec_LTLIBRARIES = \
	38	+loaders_LTLIBRARIES = \
	39	$(PNG_LIB) \
	40	$(JPEG_LIB) \
	41	$(GIF_LIB) \
	42	@@ -134,7 +134,7 @@
	43	extra_sources =
	44
	45	else
	46	-libexec_LTLIBRARIES =
	47	+loaders_LTLIBRARIES =
	48
	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
	53	@@ -157,6 +157,7 @@
	54	fi)
	55	# echo '-- Installing $(srcdir)/html/index.sgml' ; \
	56	# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
	57	+#
	58
	59	#
	60	# Require gtk-doc when making dist
73187a90 AF	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
	63	@@ -147,27 +147,47 @@
	64
	65	dnl Test for libtiff
	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'
	83	+ ],[
	84	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	85	+ ])
	86	+ ],[
	87	+ AC_CHECK_LIB(tiff, TIFFWriteScanline,[
	88	+ AC_CHECK_HEADER(tiffio.h,[
	89	+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
	90	+ ],[
	91	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	92	+ ])
	93	+ ],[
	94	+ AC_CHECK_LIB(tiff34, TIFFFlushData,[
	95	+ AC_CHECK_HEADER(tiffio.h,[
	96	+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
	97	+ ],[
	98	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	99	+ ])
	100	+ ],[
	101	+ AC_MSG_WARN([* TIFF plug-in will not be built (TIFF library not found) *])
	102	+ ],[
	103	+ -ljpeg -lz -lm
	104	+ ])
	105	+ ],[
	106	+ -ljpeg -lz -lm
	107	+ ])
	108	+ ],[
	109	+ -lm
	110	+ ])
	111	fi
	112
	113	dnl Test for libjpeg
	114	if test -z "$LIBJPEG"; then
	115	- AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
	116	- jpeg_ok=yes,
	117	+ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[
	118	+ jpeg_ok=yes
	119	+ ],[
	120	jpeg_ok=no
	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) *])
	123	+ ])
	124	if test "$jpeg_ok" = yes; then
125	AC_MSG_CHECKING([for jpeglib.h])
126	AC_TRY_CPP(
127	@@ -175,41 +195,47 @@
128	#undef PACKAGE
129	#undef VERSION
130	#include <jpeglib.h>],
131	- jpeg_ok=yes,
132	- jpeg_ok=no)
133	- AC_MSG_RESULT($jpeg_ok)
134	+ [jpeg_ok=yes],
135	+ [jpeg_ok=no])
136	+ AC_MSG_RESULT([$jpeg_ok])
137	if test "$jpeg_ok" = yes; then
138	LIBJPEG='-ljpeg'
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)
144	+ ],[
145	+ AC_MSG_WARN([JPEG library does not support progressive saving.])
146	+ ])
147	else
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) *])
150	fi
151	fi
152	fi
153
154	dnl Test for libpng
155	if test -z "$LIBPNG"; then
156	- AC_CHECK_LIB(png, png_read_info,
157	- AC_CHECK_HEADER(png.h,
158	- png_ok=yes,
159	- png_ok=no),
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,[
163	+ png_ok=yes
164	+ ],[
165	+ png_ok=no
166	+ ])
167	+ ],[
168	+ AC_MSG_WARN([* PNG loader will not be built (PNG library not found) *])
169	+ ],[ -lz -lm])
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;],
174	- png_ok=yes,
175	- png_ok=no)
176	- AC_MSG_RESULT($png_ok)
177	+ [png_ok=yes],
178	+ [png_ok=no])
179	+ AC_MSG_RESULT([$png_ok])
180	if test "$png_ok" = yes; then
181	PNG='png'; LIBPNG='-lpng -lz'
182	else
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) *])
185	fi
186	else
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) *])
189	fi
190	fi
191
e9cb9b9f AF	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
	194	@@ -159,7 +159,7 @@
	195	-I$(top_builddir)/gdk-pixbuf \
	196	$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
	197
	198	-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
	199	+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loadersdir)\""
	200
	201	LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
	202