Use kde4-config to detect KDE4

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index d6cda9b8ef52c781b54310dc199cc6267bb22f90..6fa9c45d1360e952a74bf746cae8f02fe28a1be1 100755 (executable)
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -144,26 +144,25 @@ else
                fi
        fi
 
-       if [ "$qt4_found" != "" ]
+       kde4-config
+       if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
        then
                # test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
                if [ "$kde_includedir" = "" ]
                then
-                     if [ -f "/usr/include/kcomponentdata.h" ]
-                     then
-                             kde_includedir="/usr/include"
-                     elif [ -f "/usr/local/include/kcomponentdata.h" ]
-                     then
-                             kde_includedir="/usr/local/include"
-                     fi
+                     kde_includedir=`kde4-config --install include`
                fi
-               if [ -d "$kde_includedir" ]
+               if [ "$kde_libdir" = "" ]
+               then
+                     kde_libdir=`kde4-config --install lib`
+               fi
+               if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
                then
                        echo "KDE version 4.x detected, will enable extra image formats"
                        echo "#define USE_KDE4" >> config.h
                        echo "USE_KDE4=1" >> config.mak
                        echo KDECXXFLAGS=-I$kde_includedir >> config.mak
-                       echo KDELIBS=-lkdecore >> config.mak
+                       echo KDELIBS=-L$kde_libdir -lkdecore >> config.mak
                fi
        fi