Add gtkstockpixbufs.h.

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)

9 files changed, 96 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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):
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7d3856aab1..934c59bce6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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):
diff --git a/configure.in b/configure.in
index 195d9af398..a59167a9dd 100644
--- a/configure.in
+++ b/configure.in
@@ -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)
diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 41a3aeb13e..6f7d283ff2 100644
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -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