Commit 23eb9a76 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Don't add jasper to all_loaders if no libjasper.

2007-11-26  Tor Lillqvist  <tml@novell.com>

	* 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
parent 2d7e04ab
2007-11-26 Tor Lillqvist <tml@novell.com>
* configure.in: Don't add jasper to all_loaders if no libjasper.
2007-11-25 Bastien Nocera <hadess@hadess.net>
* configure.in: Add detection for libjasper, used by the
......
......@@ -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
......
2007-11-25 Tor Lillqvist <tml@novell.com>
* Makefile.am: Fix static build of the icns loader.
2007-11-25 Bastien Nocera <hadess@hadess.net>
* 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment