rpms/qt/devel qt-x11-opensource-src-4.5.1-mysql_config.patch, NONE, 1.1 qt.spec, 1.273, 1.274 qt-x11-opensource-src-4.5.1-mysql_config-1.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13457

Modified Files:
	qt.spec 
Added Files:
	qt-x11-opensource-src-4.5.1-mysql_config.patch 
Removed Files:
	qt-x11-opensource-src-4.5.1-mysql_config-1.patch 
Log Message:
better mysql_config patch, use --pkglibdir if available


qt-x11-opensource-src-4.5.1-mysql_config.patch:

--- NEW FILE qt-x11-opensource-src-4.5.1-mysql_config.patch ---
diff -up qt-x11-opensource-src-4.5.1/configure.mysql_config qt-x11-opensource-src-4.5.1/configure
--- qt-x11-opensource-src-4.5.1/configure.mysql_config	2009-05-04 08:30:42.198097263 -0500
+++ qt-x11-opensource-src-4.5.1/configure	2009-05-04 08:31:22.977827199 -0500
@@ -4334,6 +4334,7 @@ if [ "$CFG_ACCESSIBILITY" = "auto" ]; th
     CFG_ACCESSIBILITY=yes
 fi
 
+set -x
 # auto-detect SQL-modules support
 for _SQLDR in $CFG_SQL_AVAILABLE; do
         case $_SQLDR in
@@ -4342,8 +4343,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
 		[ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`$WHICH mysql_config`
                 if [ -x "$CFG_MYSQL_CONFIG" ]; then
                     QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null`
+                    $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \
+                      QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null`
+                    if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then
+                    QT_LFLAGS_MYSQL_R="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient_r"
+                    QT_LFLAGS_MYSQL="-L`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` -lmysqlclient"
+                    else
                     QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null`
                     QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null`
+                    fi
 		    QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null`
                     QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1`
                 fi


Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- qt.spec	4 May 2009 00:44:04 -0000	1.273
+++ qt.spec	4 May 2009 13:43:52 -0000	1.274
@@ -55,7 +55,7 @@ Patch53: qt-x11-opensource-src-4.5.0-fix
 # http://bugzilla.redhat.com/440673
 # well, not quite upstreamable yet, not but it's a first try...
 # until mysql_config can export a usable linker flags 
-Patch54: qt-x11-opensource-src-4.5.1-mysql_config-1.patch
+Patch54: qt-x11-opensource-src-4.5.1-mysql_config.patch
 
 ## qt-copy patches
 %define qt_copy 20090424


--- qt-x11-opensource-src-4.5.1-mysql_config-1.patch DELETED ---