KDE/kdelibs

[Thiago Macieira]

SVN commit 490594 by thiago:

Patch by Joshua J. Berry for correctly detecting libgif and libungif.
This is an unsermake patch. Do I have to update the scons build as well?

CCMAIL:<des at condordes.net>
CCMAIL:kde-buildsystem at kde.org


 M  +8 -0      configure.in.in  
 M  +1 -1      khtml/imload/decoders/Makefile.am  


--- trunk/KDE/kdelibs/configure.in.in #490593:490594
@@ -253,6 +253,14 @@
   AC_DEFINE(HAVE_SENDFILE,1,[Define if you want sendfile() support])
 fi
 
+GIF_LIBRARY=''
+KDE_CHECK_LIB(gif, DGifOpen, [GIF_LIBRARY='-lgif'])
+if test -z "$GIF_LIBRARY"; then
+    KDE_CHECK_LIB(ungif, DGifOpen, [GIF_LIBRARY='-lungif'],
+        [AC_MSG_ERROR(No GIF library found.)])
+fi
+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]),
--- trunk/KDE/kdelibs/khtml/imload/decoders/Makefile.am #490593:490594
@@ -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)