147269 – Digikam finds but fails to use RawEngine

Bug 147269 - Digikam finds but fails to use RawEngine

Summary: Digikam finds but fails to use RawEngine

Status:	RESOLVED FIXED

Alias:	None

Product:	digikam
Classification:	Applications
Component:	Plugin-DImg-RAW (show other bugs)
Version:	unspecified
Platform:	Compiled Sources Linux

Importance:	NOR normal
Target Milestone:	---
Assignee:	Digikam Developers

URL:
Keywords:

Depends on:
Blocks:

Reported:	2007-06-26 21:51 UTC by Chris Spiegel
Modified:	2018-04-01 09:47 UTC (History)
CC List:	2 users (show)

See Also:
Latest Commit:
Version Fixed In:	0.9.3
Sentry Crash Report:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.

Description Chris Spiegel 2007-06-26 21:51:36 UTC

Version:           0.9.2 (using KDE KDE 3.5.7)
Installed from:    Compiled From Sources
Compiler:          gcc 3.4.6 
OS:                Linux

This is, I believe, related to 146312, which I have posted to.  That bug, however, is closed, so I've opened a new one.

The immediate problem is that libkdcraw is installed in a "non-standard" location.  This location is, though, where digikam is being installed.  Moreover, there are pkg-config files for libkdcraw.

Thus digikam is able to find where I installed libkdcraw.  It sets LIBKDCRAW_CFLAGS and LIBKDCRAW_LIBS in the Makefiles.  The problem is that neither of these variables is actually used, so the libkdcraw include path (and presumably at link-time, the library path) is unknown.  As stated in bug 146312, digikam shouldn't search the entire drive for non-standard install locations.  It should, however, use libraries that it does find, regardless of where they are.

Comment 1 Rex Dieter 2007-06-27 06:06:04 UTC

You'll likely need to set env var PKG_CONFIG_PATH so that pkg-config can find things in their "non-standard" locations.

Comment 2 Chris Spiegel 2007-06-27 06:56:46 UTC

It is set.  pkg-config does find them.  The problem is that digikam doesn't actually use the information it has gathered.  As stated above, the makefile variables are set to the proper values.  Those variables just aren't used.

Comment 3 Rex Dieter 2007-06-27 14:57:23 UTC

I disagree, LIBKDCRAW_CFLAGS, LIBKDCRAW_LIBS seem to be used all over the place:
$ cd digikam-0.9.2-final
$ find -name Makefile.am | xargs grep LIBKDCRAW
...
./digikam/utilities/imageeditor/editor/Makefile.am:        $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/utilities/imageeditor/canvas/Makefile.am:            $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/utilities/cameragui/Makefile.am:         $(GPHOTO_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/libs/imageproperties/Makefile.am:            $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS)
./digikam/libs/dimg/Makefile.am:                     $(LIBKDCRAW_LIBS) $(LCMS_LIBS)
./digikam/libs/dimg/Makefile.am:INCLUDES = $(all_includes) $(LIBKDCRAW_CFLAGS) \
./digikam/libs/dimg/loaders/Makefile.am:                           $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) \
./digikam/libs/dmetadata/Makefile.am:libdmetadata_la_LIBADD  = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS)
./digikam/libs/dmetadata/Makefile.am:      $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/showfoto/setup/Makefile.am:      $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/showfoto/Makefile.am:    $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)
./digikam/digikam/Makefile.am:     $(LIBKIPI_CFLAGS) $(LIBKDCRAW_CFLAGS) $(GPHOTO_CFLAGS) $(all_includes)
./digikam/themedesigner/Makefile.am:           $(LIBKEXIV2_CFLAGS) $(LIBKDCRAW_CFLAGS) $(all_includes)

Comment 4 Rex Dieter 2007-06-27 14:59:29 UTC

What may help more here is what does
pkg-config --cflags libkdcraw
pkg-config --libs libkdcraw
say?

Comment 5 Chris Spiegel 2007-06-27 19:06:00 UTC

pkg-config --cflags libkdcraw: -I/opt/kde3apps/include
pkg-config --libs libkdcraw: -L/opt/kde3apps/lib -lkdcraw

The first error occurs in digikam/libs/histogram where g++ cannot find libkdcraw/rawdecodingsettings.h, which is in /opt/kde3apps/include.  This Makefile only sets LIBKDCRAW_CFLAGS, it does not use the variable.

If it's helpful, I can try to create a list of all directories that need the include path to libkdcraw.

Comment 6 Rex Dieter 2007-06-27 19:16:51 UTC

> If it's helpful, I can try to create a list of all directories that need the 
> include path to libkdcraw. 

yes, please do!  Given that, should be easy enough to fix.

Comment 7 Chris Spiegel 2007-06-27 21:22:51 UTC

These are the directories whose Makefiles are missing the proper include path:

libs/histogram
libs/dimg/filters
libs/widgets/imageplugins
libs/widgets/common
libs/widgets/iccprofiles
libs/greycstoration
libs/thumbbar
libs/dialogs
utilities/imageeditor/tools
utilities/slideshow
imageplugins/coreplugin/sharpnesseditor
imageplugins/coreplugin/hsl
imageplugins/coreplugin/ratiocrop
imageplugins/*

There appears to be a similar problem with libkexiv2.  My libkexiv2 is installed in the same place as libkdcraw, but were it not, I believe that the following subdirs would need their Makefiles updated to use LIBKEXIV2_CFLAGS:

libs/widgets/iccprofiles
libs/thumbbar
libs/dialogs

Linking worked fine, so my report that LIBKDCRAW_LIBS is unused was incorrect.  Sorry about that.

Comment 8 Achim Bohnet 2007-06-30 22:55:17 UTC

SVN commit 681928 by ach:

build fix: make sure libkexiv2 and libkdcraw header files
are found when install in a different location.

BUG: 147269


 M  +1 -0      imageplugins/adjustcurves/Makefile.am  
 M  +1 -0      imageplugins/adjustlevels/Makefile.am  
 M  +1 -0      imageplugins/antivignetting/Makefile.am  
 M  +1 -0      imageplugins/blurfx/Makefile.am  
 M  +1 -0      imageplugins/border/Makefile.am  
 M  +1 -0      imageplugins/channelmixer/Makefile.am  
 M  +1 -0      imageplugins/charcoal/Makefile.am  
 M  +1 -0      imageplugins/colorfx/Makefile.am  
 M  +1 -0      imageplugins/coreplugin/Makefile.am  
 M  +1 -0      imageplugins/coreplugin/hsl/Makefile.am  
 M  +1 -0      imageplugins/coreplugin/ratiocrop/Makefile.am  
 M  +1 -0      imageplugins/coreplugin/sharpnesseditor/Makefile.am  
 M  +1 -0      imageplugins/distortionfx/Makefile.am  
 M  +1 -0      imageplugins/emboss/Makefile.am  
 M  +1 -0      imageplugins/filmgrain/Makefile.am  
 M  +1 -0      imageplugins/freerotation/Makefile.am  
 M  +1 -0      imageplugins/hotpixels/Makefile.am  
 M  +1 -0      imageplugins/infrared/Makefile.am  
 M  +1 -0      imageplugins/inpainting/Makefile.am  
 M  +1 -0      imageplugins/inserttext/Makefile.am  
 M  +1 -0      imageplugins/lensdistortion/Makefile.am  
 M  +1 -0      imageplugins/noisereduction/Makefile.am  
 M  +1 -0      imageplugins/oilpaint/Makefile.am  
 M  +1 -0      imageplugins/perspective/Makefile.am  
 M  +1 -0      imageplugins/raindrop/Makefile.am  
 M  +1 -0      imageplugins/restoration/Makefile.am  
 M  +1 -0      imageplugins/sheartool/Makefile.am  
 M  +1 -0      imageplugins/superimpose/Makefile.am  
 M  +1 -0      imageplugins/texture/Makefile.am  
 M  +1 -0      imageplugins/whitebalance/Makefile.am  
 M  +3 -1      libs/dialogs/Makefile.am  
 M  +2 -1      libs/dimg/filters/Makefile.am  
 M  +2 -1      libs/greycstoration/Makefile.am  
 M  +3 -2      libs/histogram/Makefile.am  
 M  +3 -1      libs/thumbbar/Makefile.am  
 M  +3 -1      libs/widgets/common/Makefile.am  
 M  +3 -1      libs/widgets/iccprofiles/Makefile.am  
 M  +2 -1      libs/widgets/imageplugins/Makefile.am  
 M  +1 -0      utilities/imageeditor/tools/Makefile.am  
 M  +1 -0      utilities/slideshow/Makefile.am  


--- branches/extragear/kde3/graphics/digikam/imageplugins/adjustcurves/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/adjustlevels/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/antivignetting/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/blurfx/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/border/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/channelmixer/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/charcoal/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/colorfx/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/Makefile.am #681927:681928
@@ -19,6 +19,7 @@
 	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/sharpnesseditor \
 	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/hsl \
 	       -I$(top_srcdir)/digikam/imageplugins/coreplugin/ratiocrop \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_core_la_SOURCES = imageplugin_core.cpp imageeffect_bwsepia.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/hsl/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/digikam \
+	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes) 
 
 libhsl_la_SOURCES = imageeffect_hsl.cpp hspreviewwidget.cpp 
--- branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/ratiocrop/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/digikam \
+	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes) 
 
 libratiocrop_la_SOURCES = imageeffect_ratiocrop.cpp imageselectionwidget.cpp 
--- branches/extragear/kde3/graphics/digikam/imageplugins/coreplugin/sharpnesseditor/Makefile.am #681927:681928
@@ -19,6 +19,7 @@
 	   -I$(top_srcdir)/digikam/libs/dimg/filters \
 	   -I$(top_srcdir)/digikam/digikam \
 	   -I$(top_srcdir)/digikam/imageplugins/coreplugin/sharpnesseditor/clapack \
+	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes) 
 
 libsharpnesseditor_la_LIBADD = $(top_builddir)/digikam/imageplugins/coreplugin/sharpnesseditor/clapack/liblapack.la 
--- branches/extragear/kde3/graphics/digikam/imageplugins/distortionfx/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/emboss/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/filmgrain/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/freerotation/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)
 
 digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/hotpixels/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
         
 digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/infrared/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/inpainting/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
 	       -I$(top_srcdir)/digikam/libs/greycstoration \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/inserttext/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)   
 
 digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/lensdistortion/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/noisereduction/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/oilpaint/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/perspective/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)  
 
 digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/raindrop/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/restoration/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
 	       -I$(top_srcdir)/digikam/libs/greycstoration \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/sheartool/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes)  
         
 digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/superimpose/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/libs/thumbbar \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cpp dirselectwidget.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/texture/Makefile.am #681927:681928
@@ -15,6 +15,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \
--- branches/extragear/kde3/graphics/digikam/imageplugins/whitebalance/Makefile.am #681927:681928
@@ -14,6 +14,7 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
+	       $(LIBKDCRAW_CFLAGS) \
 	       $(all_includes) 
 
 digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \
--- branches/extragear/kde3/graphics/digikam/libs/dialogs/Makefile.am #681927:681928
@@ -25,7 +25,9 @@
 	       -I$(top_srcdir)/digikam/libs/widgets/iccprofiles \
 	       -I$(top_srcdir)/digikam/libs/widgets/imageplugins \
 	       -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(LIBKEXIV2_CFLAGS) \
+		$(all_includes)
 
 digikaminclude_HEADERS = ctrlpaneldlg.h imagedlgbase.h imageguidedlg.h \
 	                     iccprofileinfodlg.h dprogressdlg.h  
--- branches/extragear/kde3/graphics/digikam/libs/dimg/filters/Makefile.am #681927:681928
@@ -12,7 +12,8 @@
 	       -I$(top_srcdir)/digikam/libs/levels \
 	       -I$(top_srcdir)/digikam/libs/histogram \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes) 
+		$(LIBKDCRAW_CFLAGS) \
+		$(all_includes) 
 	   
 
 digikaminclude_HEADERS = bcgmodifier.h hslmodifier.h dimgthreadedfilter.h dimgimagefilters.h \
--- branches/extragear/kde3/graphics/digikam/libs/greycstoration/Makefile.am #681927:681928
@@ -11,7 +11,8 @@
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/filters \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(all_includes)
 
 digikaminclude_HEADERS = greycstorationiface.h greycstorationwidget.h greycstorationsettings.h 
 
--- branches/extragear/kde3/graphics/digikam/libs/histogram/Makefile.am #681927:681928
@@ -7,8 +7,9 @@
 libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
-	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes) 
+		-I$(top_srcdir)/digikam/digikam \
+		$(LIBKDCRAW_CFLAGS) \
+		$(all_includes) 
 
 digikaminclude_HEADERS = imagehistogram.h 
 
--- branches/extragear/kde3/graphics/digikam/libs/thumbbar/Makefile.am #681927:681928
@@ -9,7 +9,9 @@
 INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(LIBKEXIV2_CFLAGS) \
+		$(all_includes)
 
 digikaminclude_HEADERS = thumbbar.h 
 
--- branches/extragear/kde3/graphics/digikam/libs/widgets/common/Makefile.am #681927:681928
@@ -14,8 +14,10 @@
 	       -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dimg/loaders \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(all_includes)
 
+
 digikaminclude_HEADERS = histogramwidget.h colorgradientwidget.h curveswidget.h sidebar.h \
                          squeezedcombobox.h dpopupmenu.h statuszoombar.h statusnavigatebar.h \
 			 statusprogressbar.h dcursortracker.h paniconwidget.h previewwidget.h 
--- branches/extragear/kde3/graphics/digikam/libs/widgets/iccprofiles/Makefile.am #681927:681928
@@ -14,7 +14,9 @@
 	       -I$(top_srcdir)/digikam/libs/dimg \
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(LIBKEXIV2_CFLAGS) \
+		$(all_includes)
            
 digikaminclude_HEADERS = cietonguewidget.h iccprofilewidget.h iccpreviewwidget.h 
 
--- branches/extragear/kde3/graphics/digikam/libs/widgets/imageplugins/Makefile.am #681927:681928
@@ -13,7 +13,8 @@
 	       -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/widgets/common \
 	       -I$(top_srcdir)/digikam/digikam \
-	       $(all_includes)
+		$(LIBKDCRAW_CFLAGS) \
+		$(all_includes)
 
 digikaminclude_HEADERS = imageregionwidget.h imagepaniconwidget.h \
 	                     imagepannelwidget.h imageguidewidget.h \
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/tools/Makefile.am #681927:681928
@@ -13,5 +13,6 @@
 	  -I$(top_srcdir)/digikam/libs/greycstoration \
 	  -I$(top_srcdir)/digikam/utilities/imageeditor/canvas \
 	  -I$(top_srcdir)/digikam/utilities/imageeditor/editor \
+	  $(LIBKDCRAW_CFLAGS) \
 	  $(all_includes) 
 
--- branches/extragear/kde3/graphics/digikam/utilities/slideshow/Makefile.am #681927:681928
@@ -5,6 +5,7 @@
 	   -I$(top_srcdir)/digikam/libs/dmetadata \
 	   -I$(top_srcdir)/digikam/libs/themeengine \
 	   -I$(top_srcdir)/digikam/libs/threadimageio \
+	   $(LIBKDCRAW_CFLAGS) \
 	   $(all_includes)
 
 noinst_LTLIBRARIES = libslideshow.la

Comment 9 Chris Spiegel 2007-07-02 19:59:37 UTC

I just checked out digikam from SVN and it built perfectly.  Thanks!