summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@nokia.com>2010-06-22 16:14:42 (GMT)
committerPierre Rossi <pierre.rossi@nokia.com>2010-06-30 20:00:29 (GMT)
commit5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688 (patch)
tree02860e73dab95b71b73ce00b6c65a3552e03819f /configure
parent6a218a31de60ea6f3f75fb6df014ef7323a264d6 (diff)
downloadQt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.zip
Qt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.tar.gz
Qt-5eefab7dfaf11c2c53c1fa856b6ed94b39d5a688.tar.bz2
Use built-in iconv on Solaris if available
Task-number: QTBUG-1853 Reviewed-by: Thiago
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 7f6d43b..4650229 100755
--- a/configure
+++ b/configure
@@ -5154,6 +5154,8 @@ if [ "$CFG_ICONV" != "no" ]; then
CFG_ICONV=no
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_ICONV=yes
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/sun-libiconv" "SUN libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
+ CFG_ICONV=sun
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/gnu-libiconv" "GNU libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_ICONV=gnu
else
@@ -6675,6 +6677,7 @@ fi
[ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis"
[ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups"
[ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv"
+[ "$CFG_ICONV" = "sun" ] && QT_CONFIG="$QT_CONFIG sun-libiconv"
[ "$CFG_ICONV" = "gnu" ] && QT_CONFIG="$QT_CONFIG gnu-libiconv"
[ "$CFG_GLIB" = "yes" ] && QT_CONFIG="$QT_CONFIG glib"
[ "$CFG_GSTREAMER" = "yes" ] && QT_CONFIG="$QT_CONFIG gstreamer"