Merge ../mlt

[melted] / src / modules / qimage / configure

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index 30c4424..7111947 100755 (executable)
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -16,13 +16,13 @@ EOF
 else
        targetos=$(uname -s)
        case $targetos in
-    MINGW32*)
-        export LIBSUF=.dll
-        ;;
+       MINGW32*)
+               export LIBSUF=.dll
+               ;;
        Darwin)
                export LIBSUF=.dylib
                ;;
-       Linux)
+       Linux|FreeBSD)
                export LIBSUF=.so
                ;;
        *)
@@ -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
@@ -65,11 +65,21 @@ else
                esac
        done
 
-       if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
+       pkg-config --exists 'QtGui >= 4'
+       if [ $? -eq 0 ] && [ "$force_qt3" = "" ]
+       then
+               echo "Qt version 4.x detected, will compile Qt4 qimage producer"
+               qt4_found=true
+               echo "#define USE_QT4" > config.h
+               echo "USE_QT4=1" > config.mak
+               echo QTCXXFLAGS=$(pkg-config --cflags QtGui) >> config.mak
+               echo QTLIBS=$(pkg-config --libs QtGui) >> config.mak
+               
+       elif [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
        then
 
                # test if we have a Qt3 or Qt4
-               if test -f $qimage_libdir/libQtCore.so && [ "$force_qt3" = "" ]
+               if [ -f "$qimage_libdir/libQtCore.so" ] || [ -d "$qimage_libdir/QtGui.framework" ] && [ "$force_qt3" = "" ]
                then
                        echo "Qt version 4.x detected, will compile Qt4 qimage producer"
                        qt4_found=true
@@ -85,8 +95,14 @@ else
                then
                        echo "#define USE_QT4" >> config.h
                        echo "USE_QT4=1" >> config.mak
-                       echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-                       echo QTLIBS=-L$qimage_libdir -lQtGui >> config.mak
+                       if [ -d "$qimage_libdir/QtGui.framework" ]
+                       then
+                               echo QTCXXFLAGS=$(pkg-config --cflags QtGui) >> config.mak
+                               echo QTLIBS=$(pkg-config --libs QtGui) >> config.mak
+                       else
+                               echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
+                               echo QTLIBS=-L$qimage_libdir -lQtGui >> config.mak
+                       fi
                else 
                    if [ -d "$kde_includedir" ]
                    then 
@@ -94,13 +110,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