[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) 	\
@@ -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)
 
--- 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
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) \
1b48939e JB	51	@@ -159,7 +159,7 @@
	52	-I$(top_builddir)/gdk-pixbuf \
	53	$(X11_CFLAGS) $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS)
	54
	55	-AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
	56	+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loadersdir)\""
	57
	58	LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
	59
7738300c AF	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
	62	@@ -157,6 +157,7 @@
	63	fi)
	64	# echo '-- Installing $(srcdir)/html/index.sgml' ; \
	65	# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
	66	+#
	67
	68	#
	69	# Require gtk-doc when making dist
73187a90 AF	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
	72	@@ -147,27 +147,47 @@
	73
	74	dnl Test for libtiff
	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'
	92	+ ],[
	93	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	94	+ ])
	95	+ ],[
	96	+ AC_CHECK_LIB(tiff, TIFFWriteScanline,[
	97	+ AC_CHECK_HEADER(tiffio.h,[
	98	+ TIFF='tiff'; LIBTIFF='-ltiff -ljpeg -lz'
	99	+ ],[
	100	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	101	+ ])
	102	+ ],[
	103	+ AC_CHECK_LIB(tiff34, TIFFFlushData,[
	104	+ AC_CHECK_HEADER(tiffio.h,[
	105	+ TIFF='tiff'; LIBTIFF='-ltiff34 -ljpeg -lz'
	106	+ ],[
	107	+ AC_MSG_WARN([* TIFF loader will not be built (TIFF header files not found) *])
	108	+ ])
	109	+ ],[
	110	+ AC_MSG_WARN([* TIFF plug-in will not be built (TIFF library not found) *])
	111	+ ],[
	112	+ -ljpeg -lz -lm
	113	+ ])
	114	+ ],[
	115	+ -ljpeg -lz -lm
	116	+ ])
	117	+ ],[
	118	+ -lm
	119	+ ])
	120	fi
	121
	122	dnl Test for libjpeg
	123	if test -z "$LIBJPEG"; then
	124	- AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
	125	- jpeg_ok=yes,
	126	+ AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,[
	127	+ jpeg_ok=yes
	128	+ ],[
	129	jpeg_ok=no
	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) *])
	132	+ ])
	133	if test "$jpeg_ok" = yes; then
134	AC_MSG_CHECKING([for jpeglib.h])
135	AC_TRY_CPP(
136	@@ -175,41 +195,47 @@
137	#undef PACKAGE
138	#undef VERSION
139	#include <jpeglib.h>],
140	- jpeg_ok=yes,
141	- jpeg_ok=no)
142	- AC_MSG_RESULT($jpeg_ok)
143	+ [jpeg_ok=yes],
144	+ [jpeg_ok=no])
145	+ AC_MSG_RESULT([$jpeg_ok])
146	if test "$jpeg_ok" = yes; then
147	LIBJPEG='-ljpeg'
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)
153	+ ],[
154	+ AC_MSG_WARN([JPEG library does not support progressive saving.])
155	+ ])
156	else
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) *])
159	fi
160	fi
161	fi
162
163	dnl Test for libpng
164	if test -z "$LIBPNG"; then
165	- AC_CHECK_LIB(png, png_read_info,
166	- AC_CHECK_HEADER(png.h,
167	- png_ok=yes,
168	- png_ok=no),
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,[
172	+ png_ok=yes
173	+ ],[
174	+ png_ok=no
175	+ ])
176	+ ],[
177	+ AC_MSG_WARN([* PNG loader will not be built (PNG library not found) *])
178	+ ],[ -lz -lm])
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;],
183	- png_ok=yes,
184	- png_ok=no)
185	- AC_MSG_RESULT($png_ok)
186	+ [png_ok=yes],
187	+ [png_ok=no])
188	+ AC_MSG_RESULT([$png_ok])
189	if test "$png_ok" = yes; then
190	PNG='png'; LIBPNG='-lpng -lz'
191	else
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) *])
194	fi
195	else
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) *])
198	fi
199	fi
200