]>
Commit | Line | Data |
---|---|---|
378d39c4 SS |
1 | diff -up qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config qt-everywhere-opensource-src-4.7.0-beta2/configure |
2 | --- qt-everywhere-opensource-src-4.7.0-beta2/configure.mysql_config 2010-06-29 20:53:10.000000000 -0500 | |
3 | +++ qt-everywhere-opensource-src-4.7.0-beta2/configure 2010-07-08 08:30:32.148864934 -0500 | |
4 | @@ -4849,8 +4849,15 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do | |
5 | [ -z "$CFG_MYSQL_CONFIG" ] && CFG_MYSQL_CONFIG=`"$WHICH" mysql_config` | |
6 | if [ -x "$CFG_MYSQL_CONFIG" ]; then | |
7 | QT_CFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --include 2>/dev/null` | |
8 | + $CFG_MYSQL_CONFIG --pkglibdir &>/dev/null && \ | |
9 | + QT_MYSQL_PKGLIBDIR=`$CFG_MYSQL_CONFIG --pkglibdir 2>/dev/null` | |
10 | + if [ -n "$QT_MYSQL_PKGLIBDIR" ]; then | |
11 | + QT_LFLAGS_MYSQL_R="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient_r" | |
12 | + QT_LFLAGS_MYSQL="-L$QT_MYSQL_PKGLIBDIR -lmysqlclient" | |
13 | + else | |
14 | QT_LFLAGS_MYSQL_R=`$CFG_MYSQL_CONFIG --libs_r 2>/dev/null` | |
15 | QT_LFLAGS_MYSQL=`$CFG_MYSQL_CONFIG --libs 2>/dev/null` | |
16 | + fi | |
17 | QT_MYSQL_VERSION=`$CFG_MYSQL_CONFIG --version 2>/dev/null` | |
18 | QT_MYSQL_VERSION_MAJOR=`echo $QT_MYSQL_VERSION | cut -d . -f 1` | |
19 | fi |