Re: gtk+ configure.in patch
- From: Owen Taylor <otaylor redhat com>
- To: Sander Vesik <Sander Vesik Sun COM>
- Cc: gtk-devel-list gnome org
- Subject: Re: gtk+ configure.in patch
- Date: Wed, 16 Jan 2002 10:35:13 -0500 (EST)
Sander Vesik <Sander Vesik Sun COM> writes:
> The following patch makes gtk+ configure correctly fail with an error if
> libpng cannot be found instead of build later breaking.
I've now committed the following patch, which hopefully addresses this
issue comprehensively.
Regards,
Owen
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.2817
diff -u -p -r1.2817 ChangeLog
--- ChangeLog 2002/01/16 08:53:14 1.2817
+++ ChangeLog 2002/01/16 15:30:43
@@ -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):
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gtk+/configure.in,v
retrieving revision 1.244
diff -u -p -r1.244 configure.in
--- configure.in 2002/01/14 01:39:24 1.244
+++ configure.in 2002/01/16 15:30:43
@@ -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,
@@ -658,6 +679,14 @@ dnl Test for libpng
else
AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
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)
Index: gtk/stock-icons/Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/stock-icons/Makefile.am,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile.am
--- gtk/stock-icons/Makefile.am 2001/11/02 00:48:28 1.13
+++ gtk/stock-icons/Makefile.am 2002/01/16 15:30:43
@@ -160,4 +160,4 @@ gtkstockpixbufs.h: $(pixbuf_dir)/gdk-pix
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]