X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Fqt%2Fconfigure;h=37fe0a2ac3b7ce01ba32d5e05df44e094e61fe9d;hb=86e90032adedba2a87c80f922d286c1c8742fa40;hp=61433c71832a4d31df1f8023cfe1b2c93a636f91;hpb=c0979bd77e64dbf75d14aeb2847b9922be9b4dd2;p=mlt

diff --git a/src/modules/qt/configure b/src/modules/qt/configure
index 61433c71..37fe0a2a 100755
--- a/src/modules/qt/configure
+++ b/src/modules/qt/configure
@@ -3,10 +3,10 @@
 if [ "$help" = "1" ]
 then
 	cat << EOF
-QImage options:
+QT options:
 
-  --qimage-libdir         - Location of QT lib directory [/usr/lib/qt4]
-  --qimage-includedir     - Location of QT include directory [/usr/include/qt4]
+  --qt-libdir         - Location of QT lib directory [/usr/lib/qt4]
+  --qt-includedir     - Location of QT include directory [/usr/include/qt4]
   --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]
@@ -31,13 +31,13 @@ else
 		;;
 	esac
 
-	qimage_includedir=
-	qimage_libdir=
+	qt_includedir=
+	qt_libdir=
 
 	if [ "$QTDIR" != "" ]
 	then
-		qimage_includedir="$QTDIR/include"
-		qimage_libdir="$QTDIR/lib"
+		qt_includedir="$QTDIR/include"
+		qt_libdir="$QTDIR/lib"
 	fi
 
 	export without_kde=
@@ -45,8 +45,8 @@ else
 	for i in "$@"
 	do
 		case $i in
-			--qimage-libdir=* )	qimage_libdir="${i#--qimage-libdir=}" ;;
-			--qimage-includedir=* )	qimage_includedir="${i#--qimage-includedir=}" ;;
+			--qt-libdir=* )	qt_libdir="${i#--qt-libdir=}" ;;
+			--qt-includedir=* )	qt_includedir="${i#--qt-includedir=}" ;;
 			--kde-libdir=* )	kde_libdir="${i#--kde-libdir=}" ;;
 			--kde-includedir=* )	kde_includedir="${i#--kde-includedir=}" ;;
 			--exif-libdir=* )	exif_libdir="${i#--exif-libdir=}" ;;
@@ -81,49 +81,49 @@ else
 		fi
 	fi
 
-	if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
+	if [ -d "$qt_libdir" -a -d "$qt_includedir" ]
 	then
 		# test if we have a Qt5 or Qt4
-		if [ -f "$qimage_libdir/libQt5Core.so" ] || [ -d "$qimage_libdir/QtWidgets.framework" ] || [ -f "$qimage_libdir/libQt5Core.a" ]
+		if [ -f "$qt_libdir/libQt5Core.so" ] || [ -d "$qt_libdir/QtWidgets.framework" ] || [ -f "$qt_libdir/libQt5Core.a" ]
 		then
 			echo "- Qt version 5.x detected"
 			# TODO re-enable KDE support when KDE Frameworks 5 widely available
 			without_kde=true
-		elif [ -f "$qimage_libdir/libQtCore.so" ] || [ -d "$qimage_libdir/QtCore.framework" ] || [ -f "$qimage_libdir/libQtCore4.a" ]
+		elif [ -f "$qt_libdir/libQtCore.so" ] || [ -d "$qt_libdir/QtCore.framework" ] || [ -f "$qt_libdir/libQtCore4.a" ]
 		then
 			echo "- Qt version 4.x detected"
 		else
 			echo "- Qt not found: disabling"
-			touch ../disable-qimage
+			touch ../disable-qt
 			exit 0
 		fi
 
-		echo "- Include directory: " $qimage_includedir
+		echo "- Include directory: " $qt_includedir
 
 		# Qt5 on Linux, BSD, or Windows
-		if [ -f "$qimage_libdir/libQt5Core.so" ] || [ -f "$qimage_libdir/libQt5Core.a" ]
+		if [ -f "$qt_libdir/libQt5Core.so" ] || [ -f "$qt_libdir/libQt5Core.a" ]
 		then
-			echo QTCXXFLAGS=-I$qimage_includedir -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL -I$qimage_includedir/QtWidgets >> config.mak
-			echo QTLIBS=-Wl,-rpath-link,"$qimage_libdir" -L"$qimage_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5OpenGL -lQt5Widgets >> config.mak
+			echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtOpenGL -I$qt_includedir/QtWidgets >> config.mak
+			echo QTLIBS=-Wl,-rpath-link,"$qt_libdir" -L"$qt_libdir" -lQt5Core -lQt5Gui -lQt5Xml -lQt5Svg -lQt5OpenGL -lQt5Widgets >> config.mak
 		# Qt5 on OS X
-		elif [ -d "$qimage_libdir/QtWidgets.framework" ]
+		elif [ -d "$qt_libdir/QtWidgets.framework" ]
 		then
-				echo QTCXXFLAGS=-I$qimage_includedir -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL -I$qimage_includedir/QtWidgets >> config.mak
-				echo QTLIBS=-F"$qimage_libdir" -framework QtCore -framework QtGui -framework QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
+				echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtOpenGL -I$qt_includedir/QtWidgets >> config.mak
+				echo QTLIBS=-F"$qt_libdir" -framework QtCore -framework QtGui -framework QtXml -framework QtSvg -framework QtOpenGL -framework QtWidgets >> config.mak
 		# Qt4 on OS X
-		elif [ -d "$qimage_libdir/QtGui.framework" ]
+		elif [ -d "$qt_libdir/QtGui.framework" ]
 		then
 			echo QTCXXFLAGS=$(pkg-config --cflags QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
 			echo QTLIBS=$(pkg-config --libs QtCore QtGui QtXml QtSvg QtOpenGL) >> config.mak
 		# Qt4 on Windows
-		elif [ -f "$qimage_libdir/libQtCore4.a" ]
+		elif [ -f "$qt_libdir/libQtCore4.a" ]
 		then
-			echo QTCXXFLAGS=-I$qimage_includedir -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL >> config.mak
-			echo QTLIBS=-Wl,-enable-auto-import -L$qimage_libdir -lQtCore4 -lQtGui4 -lQtXml4 -lQtSvg4 -lQtOpenGL4 >> config.mak
+			echo QTCXXFLAGS=-I$qt_includedir -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtOpenGL >> config.mak
+			echo QTLIBS=-Wl,-enable-auto-import -L$qt_libdir -lQtCore4 -lQtGui4 -lQtXml4 -lQtSvg4 -lQtOpenGL4 >> config.mak
 		# Qt4 on Linux or BSD
 		else
-			echo QTCXXFLAGS=-I$qimage_includedir  -I$qimage_includedir/QtCore -I$qimage_includedir/QtGui -I$qimage_includedir/QtXml -I$qimage_includedir/QtSvg -I$qimage_includedir/QtOpenGL >> config.mak
-			echo QTLIBS=-L$qimage_libdir -lQtCore -lQtGui -lQtXml -lQtSvg -lQtOpenGL >> config.mak
+			echo QTCXXFLAGS=-I$qt_includedir  -I$qt_includedir/QtCore -I$qt_includedir/QtGui -I$qt_includedir/QtXml -I$qt_includedir/QtSvg -I$qt_includedir/QtOpenGL >> config.mak
+			echo QTLIBS=-L$qt_libdir -lQtCore -lQtGui -lQtXml -lQtSvg -lQtOpenGL >> config.mak
 		fi
 	else
 		pkg-config --exists 'QtGui >= 4'
@@ -141,7 +141,7 @@ else
 				echo QTLIBS=$(pkg-config --libs Qt5Core Qt5Gui Qt5Xml Qt5Svg Qt5OpenGL Qt5Widgets) >> config.mak
 			else
 				echo "- Qt not found - disabling"
-				touch ../disable-qimage
+				touch ../disable-qt
 			fi
 		fi
 	fi
@@ -151,7 +151,7 @@ else
 		kde4-config
 		if [ $? -eq 0 ] && [ "$qt4_found" != "" ]
 		then
-			# test if we have KDE4, required on some systems to get QImage extra formats (xcf, ...)
+			# test if we have KDE4, required on some systems to get QT extra formats (xcf, ...)
 			if [ "$kde_includedir" = "" ]
 			then
 				  kde_includedir=`kde4-config --install include`