From: j-b-m <j-b-m@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Mon, 14 Jul 2008 21:57:39 +0000 (+0000)
Subject: qimage/configure: Fix Qt4 detection
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=ac637bc52b0d99b54751b4b41f302e7fd28cbbdc;p=melted

qimage/configure: Fix Qt4 detection

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1161 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index bde70b0..30c4424 100755
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -48,7 +48,7 @@ else
 	if [ "$QTDIR" != "" ]
 	then
 		qimage_includedir="$QTDIR/include"
-		qimage_libdir="$QTDIR"
+		qimage_libdir="$QTDIR/lib"
 	fi
 
 	export force_qt3=
@@ -69,7 +69,7 @@ else
 	then
 
 		# test if we have a Qt3 or Qt4
-		if test -f $QTDIR/lib/libQtCore.so && [ "$force_qt3" = "" ]
+		if test -f $qimage_libdir/libQtCore.so && [ "$force_qt3" = "" ]
 		then
 			echo "Qt version 4.x detected, will compile Qt4 qimage producer"
 			qt4_found=true
@@ -86,7 +86,7 @@ else
 			echo "#define USE_QT4" >> config.h
 			echo "USE_QT4=1" >> config.mak
 			echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-			echo QTLIBS=-L$qimage_libdir/lib -lQtGui >> config.mak
+			echo QTLIBS=-L$qimage_libdir -lQtGui >> config.mak
 		else 
 		    if [ -d "$kde_includedir" ]
 		    then 
@@ -95,13 +95,13 @@ else
 			    echo "#define USE_QT3" >> config.h
 			    echo "USE_QT3=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
+			    echo QTLIBS=-L$qimage_libdir -L$kde_libdir/lib -lqt-mt >> config.mak
 		    else 
 			    echo "qimage: KDE environment not found - disabling extra image formats"
 			    echo "#define USE_QT3" >> config.h
 			    echo "USE_QT3=1" >> config.mak
 			    echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-			    echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
+			    echo QTLIBS=-L$qimage_libdir -lqt-mt >> config.mak
 		    fi
 		fi
 	else