Fix compile error on older versions of FFmepg 0.10 and 0.11.

[mlt] / src / modules / qimage / configure

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index b85606854cbb1a09e68df5d19b10b66a7c75857a..a9ec7f8170b59d779a50f4dbe1b70ed3a3492c58 100755 (executable)
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -12,6 +12,7 @@ QImage options:
   --kde-includedir        - Location of KDE include directory [/usr/include/kde]
   --exif-libdir           - Location of libexif lib directory [/usr/lib]
   --exif-includedir       - Location of libexif include directory [/usr/include/libexif]
+  --without-kde           - Don't link to KDE libraries
 
 EOF
 
@@ -34,19 +35,6 @@ else
        qimage_includedir=
        qimage_libdir=
 
-       if [ ! -d "$qimage_libdir" -o ! -d "$qimage_includedir" ]
-       then
-               qimage_includedir=/usr/include/qt3
-               qimage_libdir=/usr/lib/qt3
-               kde_includedir=/usr/include/kde
-               kde_libdir=/usr/lib
-               if [ "$KDEDIR" != "" ]
-               then
-                       kde_includedir="$KDEDIR/include"
-                       kde_libdir="$KDEDIR/lib"
-               fi
-       fi
-
        if [ "$QTDIR" != "" ]
        then
                qimage_includedir="$QTDIR/include"
@@ -55,6 +43,7 @@ else
 
        export force_qt3=
        export qt4_found=
+       export without_kde=
 
        for i in "$@"
        do
@@ -66,6 +55,7 @@ else
                        --exif-libdir=* )       exif_libdir="${i#--exif-libdir=}" ;;
                        --exif-includedir=* )   exif_includedir="${i#--exif-includedir=}" ;;
                        --force-qt3 )           force_qt3="true" ;;
+                       --without-kde ) without_kde="true" ;;
                esac
        done
 
@@ -114,27 +104,27 @@ else
                        echo "USE_QT4=1" >> config.mak
                        if [ -d "$qimage_libdir/QtGui.framework" ]
                        then
-                               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg ) >> config.mak
-                               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> config.mak
+                               echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+                               echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
                        elif [ -f "$qimage_libdir/libQtCore4.a" ]
                        then
                                echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-                               echo QTLIBS=-Wl,-enable-auto-import -L$qimage_libdir -lQtCore4 -lQtGui4 -lQtXml4 -lQtSvg4 >> config.mak
+                               echo QTLIBS=-Wl,-enable-auto-import -L$qimage_libdir -lQtCore4 -lQtGui4 -lQtXml4 -lQtSvg4 -lQtOpenGL4 >> config.mak
                        else
                                echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
-                               echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg >> config.mak
+                               echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg -lQtOpenGL >> config.mak
                        fi
-               else 
-                   if [ -d "$kde_includedir" ]
-                   then 
-                           echo "#define USE_KDE" >> config.h
-                           echo "USE_KDE=1" >> config.mak
+               else
+                   if [ "$without_kde" = "" ] && [ -d "$kde_includedir" ]
+                   then
+                           echo "#define USE_KDE3" >> config.h
+                           echo "USE_KDE3=1" >> config.mak
                            echo "#define USE_QT3" >> config.h
                            echo "USE_QT3=1" >> config.mak
                            echo QTCXXFLAGS=-I$qimage_includedir -I$kde_includedir -DQT_THREAD_SUPPORT >> config.mak
                                echo QTLIBS=-L$qimage_libdir -L$kde_libdir -lqt-mt >> config.mak
-                   else 
-                           echo "qimage: KDE environment not found - disabling extra image formats"
+                   else
+                           echo "qimage: KDE environment not found or disabled by request - disabling extra image formats"
                            echo "#define USE_QT3" >> config.h
                            echo "USE_QT3=1" >> config.mak
                            echo QTCXXFLAGS=-I$qimage_includedir -DQT_THREAD_SUPPORT>> config.mak
@@ -149,13 +139,40 @@ else
                        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
+                       echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
+                       echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
                else
                        echo "qimage: QT environment not found - disabling"
                        touch ../disable-qimage
                fi
        fi
+
+       if [ "$without_kde" = "" ]
+       then
+               kde4-config
+               if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
+               then
+                       # test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
+                       if [ "$kde_includedir" = "" ]
+                       then
+                                 kde_includedir=`kde4-config --install include`
+                       fi
+                       if [ "$kde_libdir" = "" ]
+                       then
+                                 kde_libdir=`kde4-config --install lib`
+                       fi
+                       if [ -d "$kde_includedir" ] && [ -d "$kde_libdir" ]
+                       then
+                               echo "KDE version 4.x detected, will enable extra image formats"
+                               echo "#define USE_KDE4" >> config.h
+                               echo "USE_KDE4=1" >> config.mak
+                               echo KDECXXFLAGS=-I$kde_includedir >> config.mak
+                               # the -L with kde4/devel is for Fedora
+                               echo KDELIBS=-L$kde_libdir -L${kde_libdir}/kde4/devel -lkdecore >> config.mak
+                       fi
+               fi
+       fi
+
        [ "$gpl3" = "true" ] && echo GPL3=1 >> config.mak
        exit 0
 fi