From kde-commits  Sun Oct 21 10:34:42 2007
From: Hasso Tepper <hasso () kde ! org>
Date: Sun, 21 Oct 2007 10:34:42 +0000
To: kde-commits
Subject: branches/extragear/kde3/libs/libkdcraw
Message-Id: <1192962882.995562.10316.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=119296289027257

SVN commit 727627 by hasso:

Make it to find the lcms from nonstandard places provided by user via
--with-extra-* flags. Fixes detecting lcms installed from pkgsrc package
system.


 M  +7 -0      configure.in.in  
 M  +1 -1      dcraw/Makefile.am  


--- branches/extragear/kde3/libs/libkdcraw/configure.in.in #727626:727627
@@ -36,8 +36,13 @@
 have_lcms='no'
 if test "$have_lcms_header" = 'yes'
 then
+    saved_cflags="$CFLAGS"
+    saved_ldflags="$LDFLAGS"
     saved_libs=$LIBS
     LIBS="$LIBS -llcms"
+    CFLAGS="$CFLAGS $all_includes"
+    LDFLAGS="$LDFLAGS $all_libraries"
+
     AC_TRY_LINK([
 #define inline __inline /* gcc is in ansi mode */
 #include LCMS_HEADER
@@ -49,6 +54,8 @@
 ],
         [LCMS_LIBS='-llcms'; have_lcms='yes'])
     LIBS=$saved_libs
+    CFLAGS=$saved_cflags
+    LDFLAGS=$saved_ldflags
 fi
 
 if test -z "$LCMS_LIBS"; then
--- branches/extragear/kde3/libs/libkdcraw/dcraw/Makefile.am #727626:727627
@@ -26,7 +26,7 @@
 # Note : using -std-c99 instead -std=iso9899:1990 is not possible because some compiler 
 # do not support it.
 # Thanks to Andras Mantia for this tip.
-kdcraw_CFLAGS = -Dinline= -w
+kdcraw_CFLAGS = -Dinline= -w $(all_includes)
 
 kdcraw_SOURCES = dcraw.c