AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 10:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Add gtkstockpixbufs.h.

Browse Source 
Wed Jan 16 10:18:42 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
	gtkstockpixbufs.h.

	* configure.in: Make TIFF, JPEG, PNG loaders mandatory
	unless you configure with --without-libtiff, etc.
	(#54045, Brian Cameron)
This commit is contained in:
Owen Taylor 2002-01-16 15:31:42 +00:00 committed by Owen Taylor
parent 37d1686ac6
commit 476d48ddd1
9 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-0
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-2
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-4
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-6
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
Wed Jan 16 10:18:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/stock-icons/Makefile.am (EXTRA_DIST): Add
gtkstockpixbufs.h.
* configure.in: Make TIFF, JPEG, PNG loaders mandatory
unless you configure with --without-libtiff, etc.
(#54045, Brian Cameron)
2002-01-16 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtkmenushell.c (gtk_real_menu_shell_move_current):

35
configure.in
View File

@ -591,8 +591,15 @@ else
AC_MSG_RESULT(no)
fi
dnl We allow people to disable image loaders explicitely, but if they don't we error
dnl out so that people don't accidentally build without them.
AC_ARG_WITH(libpng, [ --without-libpng Disable PNG loader for gdk-pixbuf])
AC_ARG_WITH(libjpeg, [ --without-libjpeg Disable JPEG loader for gdk-pixbuf])
AC_ARG_WITH(libtiff, [ --without-libjpeg Disable TIFF loader for gdk-pixbuf])
dnl Test for libtiff
if test -z "$LIBTIFF"; then
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
TIFF='tiff'; LIBTIFF='-ltiff',
@ -608,8 +615,15 @@ dnl Test for libtiff
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_MSG_ERROR([
*** Checks for TIFF loader failed. You can build without it by passing
*** --without-libtiff to configure but some programs using GTK+ may
*** not work properly])
fi
dnl Test for libjpeg
if test -z "$LIBJPEG"; then
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
jpeg_ok=yes,
jpeg_ok=no
@ -636,8 +650,15 @@ dnl Test for libjpeg
fi
fi
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
AC_MSG_ERROR([
*** Checks for JPEG loader failed. You can build without it by passing
*** --without-libjpeg to configure but some programs using GTK+ may
*** not work properly])
fi
dnl Test for libpng
if test -z "$LIBPNG"; then
if test x$with_libpng != xno && test -z "$LIBPNG"; then
AC_CHECK_LIB(png, png_read_info,
[AC_CHECK_HEADER(png.h,
png_ok=yes,
@ -660,6 +681,14 @@ dnl Test for libpng
fi
fi
if test x$with_libpng != xno && test -z "$LIBPNG"; then
AC_MSG_ERROR([
*** Checks for PNG loader failed. You can build without it by passing
*** --without-libpng to configure but many programs using GTK+ will
*** not work properly. The PNG loader is also needed if you are compiling
*** from CVS.])
fi
AC_SUBST(LIBTIFF)
AC_SUBST(LIBJPEG)
AC_SUBST(LIBPNG)

2
gtk/stock-icons/Makefile.am
View File

@ -160,4 +160,4 @@ gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pixbuf-csource $(IMAGES)
GDK_PIXBUF_MODULEDIR=$(pixbuf_dir)/.libs \
$(pixbuf_dir)/gdk-pixbuf-csource --raw --build-list $(VARIABLES) >$(srcdir)/gtkstockpixbufs.h
EXTRA_DIST = $(IMAGES)
EXTRA_DIST = $(IMAGES) gtkstockpixbufs.h