From 23eb9a76f68393d6ffbf64959a567ef600f14d30 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 25 Nov 2007 22:18:52 +0000 Subject: [PATCH] Don't add jasper to all_loaders if no libjasper. 2007-11-26 Tor Lillqvist * configure.in: Don't add jasper to all_loaders if no libjasper. * gdk-pixbuf/Makefile.am: Fix static build of the icns loader. svn path=/trunk/; revision=19044 --- ChangeLog | 4 ++++ configure.in | 5 ++++- gdk-pixbuf/ChangeLog | 4 ++++ gdk-pixbuf/Makefile.am | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e933ff91bc..0e5ab72cf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-11-26 Tor Lillqvist + + * configure.in: Don't add jasper to all_loaders if no libjasper. + 2007-11-25 Bastien Nocera * configure.in: Add detection for libjasper, used by the diff --git a/configure.in b/configure.in index e17ba8478e..023b32664e 100644 --- a/configure.in +++ b/configure.in @@ -901,7 +901,10 @@ else fi fi -all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx,icns,jasper" +all_loaders="png,bmp,wbmp,gif,ico,ani,jpeg,pnm,ras,tiff,xpm,xbm,tga,pcx,icns" +if test x$with_libjasper != xno; then + all_loaders="$all_loaders,jasper" +fi included_loaders="" # If no loaders specified, include all if test "x$with_included_loaders" = xyes ; then diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index f3be42fb6c..593ff30c30 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,7 @@ +2007-11-25 Tor Lillqvist + + * Makefile.am: Fix static build of the icns loader. + 2007-11-25 Bastien Nocera * Makefile.am: diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 272cc31501..51904bf24e 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -168,7 +168,7 @@ libpixbufloader_tga_la_LIBADD = $(module_libs) # # The .icns loader # -libpixbufloader_static_icns_la_SOURCES = io-icns.c +libstatic_pixbufloader_icns_la_SOURCES = io-icns.c libpixbufloader_icns_la_SOURCES = io-icns.c libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined) libpixbufloader_icns_la_LIBADD = $(module_libs) @@ -280,7 +280,7 @@ PCX_LIB = libpixbufloader-pcx.la endif if INCLUDE_ICNS -STATIC_ICNS_LIB = libpixbufloader-static-icns.la +STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la else ICNS_LIB = libpixbufloader-icns.la endif