[gdk-pixbuf] Use the GDI+ loaders by default on Windows
- From: Tor Lillqvist <tml src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] Use the GDI+ loaders by default on Windows
- Date: Mon, 27 Dec 2010 13:01:18 +0000 (UTC)
commit 34cf3df2d2c455ec8cb679fcf5d82a9723a0c390
Author: Tor Lillqvist <tml iki fi>
Date: Mon Dec 27 14:57:55 2010 +0200
Use the GDI+ loaders by default on Windows
They have been working nicely for quite some time now.
Also, use a "with" style option for GDI+ instead of an "enable" style
one, to match the other --with options.
configure.ac | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7892878..e000319 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,16 +519,14 @@ AC_ARG_WITH(libtiff,
AC_ARG_WITH(libjasper,
[AC_HELP_STRING([--with-libjasper],
[enable JPEG2000 loader for gdk-pixbuf])])
+AC_ARG_WITH(gdiplus,
+ [AC_HELP_STRING([--without-gdiplus],
+ [disable GDI+ loaders for gdk-pixbuf on Windows])])
-AC_ARG_ENABLE(gdiplus,
- [AC_HELP_STRING([--enable-gdiplus],
- [enble GDI+ loaders for gdk-pixbuf (currently known to be broken)])],,
- [enable_gdiplus=no])
-
-AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$enable_gdiplus != xno ])
+AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
dnl Test for libtiff
-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
+if test x$os_win32 = xno || test x$with_gdiplus = xno; then
if test x$with_libtiff != xno && test -z "$LIBTIFF"; then
AC_CHECK_LIB(tiff, TIFFReadRGBAImageOriented,
[AC_CHECK_HEADER(tiffio.h,
@@ -554,7 +552,7 @@ if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
fi
dnl Test for libjpeg
-if test x$os_win32 = xno || test x$enable_gdiplus = xno; then
+if test x$os_win32 = xno || test x$with_gdiplus = xno; then
if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
jpeg_ok=yes,
@@ -686,7 +684,7 @@ all_loaders="ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif"
if test x$with_libjasper = xyes; then
all_loaders="$all_loaders,jasper"
fi
-if test x$os_win32 = xyes && test x$enable_gdiplus != xno; then
+if test x$os_win32 = xyes && test x$with_gdiplus != xno; then
# Skip PNG, see comment above
gdip_formats="bmp emf gif ico jpeg tiff wmf"
for f in $gdip_formats; do
@@ -899,7 +897,7 @@ fi
AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
REBUILD_PNGS=
-if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$enable_gdiplus = xno; then
+if test -z "$LIBPNG" && test x"$os_win32" = xno -o x$with_gdiplus = xno; then
REBUILD_PNGS=#
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]