]> git.sesse.net Git - mlt/commitdiff
qimage/configure: Fix Qt3 detection and compilation
authorj-b-m <j-b-m@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 24 Jul 2008 19:20:40 +0000 (19:20 +0000)
committerj-b-m <j-b-m@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 24 Jul 2008 19:20:40 +0000 (19:20 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1163 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/qimage/configure

index 30c4424c5e80c3d1e9f408f1a574ae2df26e6f4b..a517be1f66e07b9a704ccf9094eeabd512e32cc7 100755 (executable)
@@ -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