X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fqimage%2Fconfigure;h=0e648f00fb5f5228cc77b704f5603ae12fc2e1a5;hb=1a16869c02718e42807618ed5c7a37478dd9577c;hp=586a36c71183644d03fca65d92ce5e6f4d1eca04;hpb=a5ab71761c0334c52565e034f2343d7cdc39c23d;p=melted

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index 586a36c..0e648f0 100755
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -2,13 +2,16 @@
 
 if [ "$help" = "1" ]
 then
-        cat << EOF
+	cat << EOF
 QImage options:
 
   --qimage-libdir         - Location of QT lib directory [/usr/lib/qt3]
   --qimage-includedir     - Location of QT include directory [/usr/include/qt3]
+  --kde-libdir            - Location of KDE lib directory [/usr/lib]
+  --kde-includedir        - Location of KDE include directory [/usr/include/kde]
 
 EOF
+
 else
 	targetos=$(uname -s)
 	case $targetos in
@@ -28,20 +31,46 @@ else
 	qimage_includedir=/usr/include/qt3
 	qimage_libdir=/usr/lib/qt3
 
-	[ "$QTDIR" != "" ] && qimage_libdir=$QTDIR
+	kde_includedir=/usr/include/kde
+	kde_libdir=/usr/lib
+
+	if [ "$QTDIR" != "" ]
+	then
+		qimage_includedir="$QTDIR/include"
+		qimage_libdir="$QTDIR"
+	fi
+
+	if [ "$KDEDIR" != "" ]
+	then
+		kde_includedir="$KDEDIR/include"
+		kde_libdir="$KDEDIR"
+	fi
 
 	for i in "$@"
 	do
 		case $i in
 			--qimage-libdir=* )	qimage_libdir="${i#--qimage-libdir=}" ;;
 			--qimage-includedir=* )	qimage_includedir="${i#--qimage-includedir=}" ;;
+			--kde-libdir=* )	kde_libdir="${i#--kde-libdir=}" ;;
+			--kde-includedir=* )	kde_includedir="${i#--kde-includedir=}" ;;
 		esac
 	done
 
 	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
 	then
-		echo QTCXXFLAGS=-I$qimage_includedir > config.mak
-		echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
+		echo > config.h
+		echo > config.mak
+		if [ -d "$kde_includedir" ]
+		then 
+			echo "#define USE_KDE" >> config.h
+			echo "USE_KDE=1" >> config.mak
+			echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir >> config.mak
+			echo QTLIBS=-L$qimage_libdir/lib -L$kde_libdir/lib -lqt-mt >> config.mak
+		else 
+			echo "qimage: KDE environment not found - disabling extra image formats"
+			echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
+			echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
+		fi
 		echo qimage		libmltqimage$LIBSUF >> ../producers.dat
 	else
 		echo "qimage: QT environment not found - disabling"