[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 518455 by cgilles:

digikam from trunk : fix linking with libpng. tests are requires.

CCMAIL: digikam-devel at kde.org

 M  +4 -1      configure.in.in  
 M  +1 -1      libs/dimg/loaders/Makefile.am  
 M  +1 -1      libs/dmetadata/loaders/Makefile.am  


--- trunk/extragear/graphics/digikam/configure.in.in #518454:518455
@@ -245,7 +245,10 @@
 if test "x$have_png" != "xyes"; then
   AC_WARN([digiKam requires libpng >= 1.2.7; digiKam will not be compiled.])
   DO_NOT_COMPILE="digikam digikamimageplugins $DO_NOT_COMPILE"
-fi  
+else
+  LIB_PNG="-lpng"
+  AC_SUBST(LIB_PNG)
+fi
 
 #------------------------------------------------------------------
 # Check for Exiv2 library
--- trunk/extragear/graphics/digikam/libs/dimg/loaders/Makefile.am #518454:518455
@@ -6,7 +6,7 @@
 	                        ppmloader.cpp qimageloader.cpp iccjpeg.c 
 
 libdimgloaders_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
-	   	                    $(LIBJPEG) $(LIB_TIFF) 
+	   	                    $(LIBJPEG) $(LIB_TIFF) $(LIB_PNG) 
 
 INCLUDES = $(all_includes) -I$(top_srcdir)/digikam/libs/dimg \
 	                       -I$(top_srcdir)/digikam/libs/dcraw \
--- trunk/extragear/graphics/digikam/libs/dmetadata/loaders/Makefile.am #518454:518455
@@ -5,7 +5,7 @@
 
 libdmetadataloader_la_SOURCES = dmetaloader.cpp jpegmetaloader.cpp pngmetaloader.cpp tiffmetaloader.cpp rawmetaloader.cpp
 
-libdmetadataloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libdmetadataloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBJPEG) $(LIB_TIFF) $(LIB_PNG)
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/dimg \