[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: [PATCH] trunk/kdelibs: Use giflib if it's available
From:       "Joshua J. Berry" <des () condordes ! net>
Date:       2005-12-22 3:01:27
Message-ID: 43AA1707.6090404 () condordes ! net
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Thiago Macieira wrote:
> Joshua J. Berry wrote:
> 
>>+AC_CHECK_LIB(gif, DGifOpen, [GIF_LIBRARY='-lgif'], [
>>+                   AC_CHECK_LIB(ungif, [GIF_LIBRARY='-lungif'],
> 
> 
> Looks like the second AC_CHECK_LIB call is missing an argument (the 
> function to test).

D'oh, didn't catch that.  Thanks. :)  (I unfortunately only have my
Gentoo system to test with, so I never even hit that part of the code...)

The updated patch is attached.  Thunderbird decided to wrap lines in the
middle of the patch, which would break it, I imagine...

-- 
Joshua J. Berry

"I haven't lost my mind -- it's backed up on tape somewhere."
    -- /usr/games/fortune

["gif.patch" (text/plain)]

Index: khtml/imload/decoders/Makefile.am
===================================================================
--- khtml/imload/decoders/Makefile.am	(revision 490474)
+++ khtml/imload/decoders/Makefile.am	(working copy)
@@ -2,7 +2,7 @@
 libdecoders_la_SOURCES = jpegloader.cpp pngloader.cpp gifloader.cpp
 
 libdecoders_la_METASOURCES = AUTO
-libdecoders_la_LIBADD = -ljpeg -lungif
+libdecoders_la_LIBADD = -ljpeg $(GIF_LIBRARY)
 noinst_HEADERS = jpegloader.h pngloader.h gifloader.h
 
 INCLUDES = -I$(top_srcdir)/khtml/imload $(all_includes)
Index: configure.in.in
===================================================================
--- configure.in.in	(revision 490474)
+++ configure.in.in	(working copy)
@@ -253,6 +253,12 @@
   AC_DEFINE(HAVE_SENDFILE,1,[Define if you want sendfile() support])
 fi
 
+GIF_LIBRARY=''
+AC_CHECK_LIB(gif, DGifOpen, [GIF_LIBRARY='-lgif'], [
+                   AC_CHECK_LIB(ungif, DGifOpen, [GIF_LIBRARY='-lungif'],
+                        [AC_MSG_ERROR(No GIF library found.)])])
+AC_SUBST(GIF_LIBRARY)
+
 AC_MSG_CHECKING(if MIT-SHM support is wanted)
 AC_ARG_ENABLE(mitshm,
 AC_HELP_STRING([--enable-mitshm],[use MIT-SHM for pixmap loading/saving]),

["signature.asc" (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]