AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Don't add jasper to all_loaders if no libjasper.

Browse Source 
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
This commit is contained in:
Tor Lillqvist 2007-11-25 22:18:52 +00:00 committed by Tor Lillqvist
parent 2d7e04ab55
commit 23eb9a76f6
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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

5
configure.in
View File

@ -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

4
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,7 @@
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:

4
gdk-pixbuf/Makefile.am
View File

@ -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