From: j-b-m <j-b-m@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Thu, 24 Jul 2008 19:20:40 +0000 (+0000)
Subject: qimage/configure: Fix Qt3 detection and compilation
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=1b9ac0e58548c38691c6ece781c26177c84e2baa;p=melted

qimage/configure: Fix Qt3 detection and compilation

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

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index 30c4424..a517be1 100755
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -32,7 +32,7 @@ else
 	qimage_includedir=/usr/include/qt4
 	qimage_libdir=/usr/lib/qt4
 
-	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
+	if [ ! -d "$qimage_libdir" -o ! -d "$qimage_includedir" ]
 	then
 		qimage_includedir=/usr/include/qt3
 		qimage_libdir=/usr/lib/qt3
@@ -94,13 +94,13 @@ else
 			    echo "USE_KDE=1" >> config.mak
 			    echo "#define USE_QT3" >> config.h
 			    echo "USE_QT3=1" >> config.mak
-			    echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir >> config.mak
+			    echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir -DQT_THREAD_SUPPORT >> 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 QTCXXFLAGS=-I$qimage_includedir -DQT_THREAD_SUPPORT>> config.mak
 			    echo QTLIBS=-L$qimage_libdir -lqt-mt >> config.mak
 		    fi
 		fi