Merge branch 'master' of git://mltframework.org/mlt

[mlt] / src / modules / qimage / configure

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index 2a2f5822739ccfb7cdedfe57d460e5dae61b7d57..6d1f510e1b71d4c2ac6910acbd6602e6c6378517 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
                ;;
        *)
@@ -65,7 +65,17 @@ 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 QtCore QtGui QtXml QtSvg ) >> config.mak
+               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> config.mak
+               
+       elif [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
        then
 
                # test if we have a Qt3 or Qt4
@@ -87,11 +97,11 @@ else
                        echo "USE_QT4=1" >> 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
+                               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg ) >> config.mak
+                               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> config.mak
                        else
                                echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-                               echo QTLIBS=-L$qimage_libdir -lQtGui >> config.mak
+                               echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtSvg >> config.mak
                        fi
                else 
                    if [ -d "$kde_includedir" ]