X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fqimage%2Fconfigure;h=b85606854cbb1a09e68df5d19b10b66a7c75857a;hb=87b7cf5ec1f75920a54fada8b9c1af8fe44d0aa9;hp=a517be1f66e07b9a704ccf9094eeabd512e32cc7;hpb=1b9ac0e58548c38691c6ece781c26177c84e2baa;p=mlt

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index a517be1f..b8560685 100755
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -10,27 +10,29 @@ QImage options:
   --qimage-includedir     - Location of QT include directory [/usr/include/qt4 or /usr/include/qt3]
   --kde-libdir            - Location of KDE lib directory [/usr/lib]
   --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]
 
 EOF
 
 else
 	targetos=$(uname -s)
 	case $targetos in
-    MINGW32*)
-        export LIBSUF=.dll
-        ;;
+	MINGW32*)
+		export LIBSUF=.dll
+		;;
 	Darwin)
 		export LIBSUF=.dylib
 		;;
-	Linux)
+	Linux|FreeBSD|NetBSD)
 		export LIBSUF=.so
 		;;
 	*)
 		;;
 	esac
 
-	qimage_includedir=/usr/include/qt4
-	qimage_libdir=/usr/lib/qt4
+	qimage_includedir=
+	qimage_libdir=
 
 	if [ ! -d "$qimage_libdir" -o ! -d "$qimage_includedir" ]
 	then
@@ -41,7 +43,7 @@ else
 		if [ "$KDEDIR" != "" ]
 		then
 			kde_includedir="$KDEDIR/include"
-			kde_libdir="$KDEDIR"
+			kde_libdir="$KDEDIR/lib"
 		fi
 	fi
 
@@ -61,15 +63,42 @@ else
 			--qimage-includedir=* )	qimage_includedir="${i#--qimage-includedir=}" ;;
 			--kde-libdir=* )	kde_libdir="${i#--kde-libdir=}" ;;
 			--kde-includedir=* )	kde_includedir="${i#--kde-includedir=}" ;;
+			--exif-libdir=* )	exif_libdir="${i#--exif-libdir=}" ;;
+			--exif-includedir=* )	exif_includedir="${i#--exif-includedir=}" ;;
 			--force-qt3 )		force_qt3="true" ;;
 		esac
 	done
 
-	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
+	echo > config.h
+	echo > config.mak
+
+	pkg-config --exists 'libexif'
+	if [ $? -eq 0 ]
 	then
+	    echo "Libexif found, enabling auto rotate"
+	    echo "#define USE_EXIF" >> config.h
+	    echo "USE_EXIF=1" >> config.mak
+	    echo EXIFCXXFLAGS=$(pkg-config --cflags libexif ) >> config.mak
+	    echo EXIFLIBS=$(pkg-config --libs libexif) >> config.mak
+	elif [ -d "$exif_libdir" -a -d "$exif_includedir" ]
+	then
+		# test if we have a libexif
+		if [ -f "$exif_libdir/exif-data.h" ]
+		then
+			echo "Libexif found, enabling auto rotate"
+			echo "#define USE_EXIF" >> config.h
+			echo "USE_EXIF=1" >> config.mak
+			echo EXIFCXXFLAGS=-I$exif_includedir >> config.mak
+                        echo EXIFLIBS=-L$exif_libdir lexif >> config.mak
+		else
+			echo "Libexif not found, disabling exif features (auto rotate)"
+		fi
+	fi
 
+	if [ -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" ] || [ -f "$qimage_libdir/libQtCore4.a" ] && [ "$force_qt3" = "" ]
 		then
 			echo "Qt version 4.x detected, will compile Qt4 qimage producer"
 			qt4_found=true
@@ -79,14 +108,22 @@ else
 
 		echo "Include directory: " $qimage_includedir
 
-		echo > config.h
-		echo > config.mak
 		if [ "$qt4_found" != "" ] && [ "$force_qt3" = "" ]
 		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 QtCore QtGui QtXml QtSvg ) >> config.mak
+				echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg) >> 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
+			else
+				echo QTCXXFLAGS=-I$qimage_includedir >> config.mak
+				echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg >> config.mak
+			fi
 		else 
 		    if [ -d "$kde_includedir" ]
 		    then 
@@ -95,7 +132,7 @@ else
 			    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/lib -lqt-mt >> 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"
 			    echo "#define USE_QT3" >> config.h
@@ -105,8 +142,20 @@ else
 		    fi
 		fi
 	else
-		echo "qimage: QT environment not found - disabling"
-		touch ../disable-qimage
+		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
+		else
+			echo "qimage: QT environment not found - disabling"
+			touch ../disable-qimage
+		fi
 	fi
-
+	[ "$gpl3" = "true" ] && echo GPL3=1 >> config.mak
+	exit 0
 fi