]> git.sesse.net Git - mlt/commitdiff
qimage/configure: fix build on OS X
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 10 Feb 2009 22:44:56 +0000 (22:44 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 10 Feb 2009 22:44:56 +0000 (22:44 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1349 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/qimage/configure

index a517be1f66e07b9a704ccf9094eeabd512e32cc7..2a2f5822739ccfb7cdedfe57d460e5dae61b7d57 100755 (executable)
@@ -69,7 +69,7 @@ else
        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 +85,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