qt cleanup (untested)

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2512 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/kde/qt/qt.conf

@@ -30,15 +30,18 @@ qt_main() {
 	var_insert LD_LIBRARY_PATH ':' "$QTDIR/lib"
 	var_insert PATH ':' "$QTDIR/bin"
 	export QTDIR LD_LIBRARY_PATH PATH
-	
-	qt_configure_db=""
-	pkginstalled mysql && qt_configure_db="$qt_configure_db -plugin-sql-mysql -I/opt/mysql/include/mysql -L/opt/mysql/lib"
-	# pkginstalled postgresql && qt_configure_db="$qt_configure_db -plugin-sql-psql -I/usr/lib/xemacs-21.4.14/i686-pc-linux/include/mysql"
+
+	# Qt only supports some selected options ...
+	confopt="-prefix $root/$prefix -thread -stl -qt-gif -system-zlib \
+	         -system-libmng -system-libpng -system-libjpeg -xft -xrende"
+
+	pkginstalled mysql && var_append confopt " " "-plugin-sql-mysql \
+		-I$pkg_mysql_prefix/include/mysql -L$pkg_mysql_prefix/lib"
+	# pkginstalled postgresql && var_append confopt " " "-plugin-sql-psql \
+		-I$pkg_postgresql_prefix/include" # maybe more
 
 	# an optimization crashes g++ during the Makefile generator build :-(
-	echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure \
-	  -prefix $root/$prefix -thread -stl -qt-gif -system-zlib \
-	  -system-libmng -system-libpng -system-libjpeg -xft -xrender $qt_configure_db )
+	echo "yes" | ( CXX_WRAPPER_BYPASS=1 ; ./configure $confopt )
 
 	eval $MAKE ; eval $MAKE install