Mercurial > mxe-octave

comparison src/qt-win32.patch @ 787:d57d5de5d4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed dependencies for the shared psql plugin in package qt The postgresql library -lpq depends on -lsecure32, -lssl, and so on. These are static libraries. When we build the psql plugin as a shared library, linking fails unless we provide the list of required libraries. Previously, this was taken care of with a hack in the configure script. Since that hack is not suitable for an upstream merge request, I have moved it here.
author Mark Brand <mabrand@mabrand.nl>
date Thu, 18 Feb 2010 01:56:41 +0100
parents d3d9a4a2843d
children 4d838a936a8f
comparison
equal deleted inserted replaced
786:d3d9a4a2843d 787:d57d5de5d4b2
1 This file is part of mingw-cross-env. 1 This file is part of mingw-cross-env.
2 See doc/index.html for further information. 2 See doc/index.html for further information.
3 3
4 diff --git a/configure b/configure 4 diff --git a/configure b/configure
5 index ed5891f..1a3f573 100755 5 index ed5891f..9b14df3 100755
6 --- a/configure 6 --- a/configure
7 +++ b/configure 7 +++ b/configure
8 @@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests" 8 @@ -605,7 +605,7 @@ mkdir -p "$outpath/config.tests"
9 rm -f "$outpath/config.tests/.qmake.cache" 9 rm -f "$outpath/config.tests/.qmake.cache"
10 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" 10 cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
156 + CFG_LIBPNG=system 156 + CFG_LIBPNG=system
157 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 157 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
158 CFG_LIBPNG=system 158 CFG_LIBPNG=system
159 else 159 else
160 CFG_LIBPNG=qt 160 CFG_LIBPNG=qt
161 @@ -4686,7 +4727,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 161 @@ -4686,7 +4727,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
162 fi 162 fi
163 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" 163 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
164 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" 164 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
165 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 165 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
166 + QT_LFLAGS_PSQL="$QT_LFLAGS_PSQL $PSQL_LIBS"
166 + if [ "$XPLATFORM" = "win32-g++" ]; then 167 + if [ "$XPLATFORM" = "win32-g++" ]; then
167 + echo "Skipping test for PSQL in cross build for win32-g++" 168 + echo "Skipping test for PSQL in cross build for win32-g++"
168 + if [ "$CFG_SQL_psql" = "auto" ]; then 169 + if [ "$CFG_SQL_psql" = "auto" ]; then
169 + CFG_SQL_psql=plugin 170 + CFG_SQL_psql=plugin
170 + fi 171 + fi
171 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 172 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
172 if [ "$CFG_SQL_psql" = "auto" ]; then 173 if [ "$CFG_SQL_psql" = "auto" ]; then
173 CFG_SQL_psql=plugin 174 CFG_SQL_psql=plugin
174 fi 175 fi
175 @@ -4707,7 +4753,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 176 @@ -4707,7 +4754,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
176 ;; 177 ;;
177 odbc) 178 odbc)
178 if [ "$CFG_SQL_odbc" != "no" ]; then 179 if [ "$CFG_SQL_odbc" != "no" ]; then
179 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 180 - if [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
180 + if [ "$XPLATFORM" = "win32-g++" ]; then 181 + if [ "$XPLATFORM" = "win32-g++" ]; then
182 + CFG_SQL_odbc=plugin 183 + CFG_SQL_odbc=plugin
183 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 184 + elif [ "$PLATFORM_MAC" != "yes" ] && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
184 if [ "$CFG_SQL_odbc" = "auto" ]; then 185 if [ "$CFG_SQL_odbc" = "auto" ]; then
185 CFG_SQL_odbc=plugin 186 CFG_SQL_odbc=plugin
186 fi 187 fi
187 @@ -4752,7 +4801,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 188 @@ -4752,7 +4802,12 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
188 ;; 189 ;;
189 tds) 190 tds)
190 if [ "$CFG_SQL_tds" != "no" ]; then 191 if [ "$CFG_SQL_tds" != "no" ]; then
191 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 192 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
192 + if [ "$XPLATFORM" = "win32-g++" ]; then 193 + if [ "$XPLATFORM" = "win32-g++" ]; then
196 + fi 197 + fi
197 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 198 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
198 if [ "$CFG_SQL_tds" = "auto" ]; then 199 if [ "$CFG_SQL_tds" = "auto" ]; then
199 CFG_SQL_tds=plugin 200 CFG_SQL_tds=plugin
200 fi 201 fi
201 @@ -4834,7 +4888,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do 202 @@ -4834,7 +4889,13 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
202 QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null` 203 QT_CFLAGS_SQLITE=`$PKG_CONFIG --cflags sqlite3 2>/dev/null`
203 QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null` 204 QT_LFLAGS_SQLITE=`$PKG_CONFIG --libs sqlite3 2>/dev/null`
204 fi 205 fi
205 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 206 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
206 + if [ "$XPLATFORM" = "win32-g++" ]; then 207 + if [ "$XPLATFORM" = "win32-g++" ]; then
211 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" 212 + QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite"
212 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 213 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/sqlite "SQLite" $QT_LFLAGS_SQLITE $L_FLAGS $QT_CFLAGS_SQLITE $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
213 if [ "$CFG_SQL_sqlite" = "auto" ]; then 214 if [ "$CFG_SQL_sqlite" = "auto" ]; then
214 CFG_SQL_sqlite=plugin 215 CFG_SQL_sqlite=plugin
215 fi 216 fi
216 @@ -4905,7 +4965,9 @@ fi 217 @@ -4905,7 +4966,9 @@ fi
217 218
218 # auto-detect iconv(3) support 219 # auto-detect iconv(3) support
219 if [ "$CFG_ICONV" != "no" ]; then 220 if [ "$CFG_ICONV" != "no" ]; then
220 - if [ "$PLATFORM_QWS" = "yes" ]; then 221 - if [ "$PLATFORM_QWS" = "yes" ]; then
221 + if [ "$XPLATFORM" = "win32-g++" ]; then 222 + if [ "$XPLATFORM" = "win32-g++" ]; then
222 + CFG_ICONV=no 223 + CFG_ICONV=no
223 + elif [ "$PLATFORM_QWS" = "yes" ]; then 224 + elif [ "$PLATFORM_QWS" = "yes" ]; then
224 CFG_ICONV=no 225 CFG_ICONV=no
225 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 226 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
226 CFG_ICONV=yes 227 CFG_ICONV=yes
227 @@ -5065,7 +5127,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then 228 @@ -5065,7 +5128,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
228 echo "Basic XLib functionality test failed!" 229 echo "Basic XLib functionality test failed!"
229 echo " You might need to modify the include and library search paths by editing" 230 echo " You might need to modify the include and library search paths by editing"
230 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." 231 echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}."
231 - exit 1 232 - exit 1
232 +echo NOTICE: This is a specially modifed configure script! 233 +echo NOTICE: This is a specially modifed configure script!
233 +echo For our purposes we do not want X11. 234 +echo For our purposes we do not want X11.
234 +# exit 1 235 +# exit 1
235 fi 236 fi
236 237
237 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) 238 # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x)
238 @@ -5139,7 +5203,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then 239 @@ -5139,7 +5204,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then
239 echo " You might need to modify the include and library search paths by editing" 240 echo " You might need to modify the include and library search paths by editing"
240 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" 241 echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in"
241 echo " ${XQMAKESPEC}." 242 echo " ${XQMAKESPEC}."
242 - exit 1 243 - exit 1
243 +echo NOTICE: This is a specially modifed configure script! 244 +echo NOTICE: This is a specially modifed configure script!
244 +echo For our purposes we do not want the OpenGL functionality test. 245 +echo For our purposes we do not want the OpenGL functionality test.
245 +# exit 1 246 +# exit 1
246 fi 247 fi
247 case "$PLATFORM" in 248 case "$PLATFORM" in
248 hpux*) 249 hpux*)
249 @@ -5640,7 +5706,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then 250 @@ -5640,7 +5707,10 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then
250 fi 251 fi
251 252
252 HAVE_STL=no 253 HAVE_STL=no
253 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then 254 -if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
254 +if [ "$XPLATFORM" = "win32-g++" ]; then 255 +if [ "$XPLATFORM" = "win32-g++" ]; then
256 + HAVE_STL=yes 257 + HAVE_STL=yes
257 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then 258 +elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then
258 HAVE_STL=yes 259 HAVE_STL=yes
259 fi 260 fi
260 261
261 @@ -5662,7 +5731,10 @@ fi 262 @@ -5662,7 +5732,10 @@ fi
262 263
263 # find if the platform supports IPv6 264 # find if the platform supports IPv6
264 if [ "$CFG_IPV6" != "no" ]; then 265 if [ "$CFG_IPV6" != "no" ]; then
265 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 266 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
266 + if [ "$XPLATFORM" = "win32-g++" ]; then 267 + if [ "$XPLATFORM" = "win32-g++" ]; then
268 + CFG_IPV6=yes 269 + CFG_IPV6=yes
269 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 270 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
270 CFG_IPV6=yes 271 CFG_IPV6=yes
271 else 272 else
272 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then 273 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
273 @@ -5776,7 +5848,10 @@ fi 274 @@ -5776,7 +5849,10 @@ fi
274 275
275 # find if the platform supports X/Open Large File compilation environment 276 # find if the platform supports X/Open Large File compilation environment
276 if [ "$CFG_LARGEFILE" != "no" ]; then 277 if [ "$CFG_LARGEFILE" != "no" ]; then
277 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then 278 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
278 + if [ "$XPLATFORM" = "win32-g++" ]; then 279 + if [ "$XPLATFORM" = "win32-g++" ]; then
280 + CFG_LARGEFILE=yes 281 + CFG_LARGEFILE=yes
281 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then 282 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/largefile "X/Open Large File" $L_FLAGS $I_FLAGS $l_FLAGS; then
282 CFG_LARGEFILE=yes 283 CFG_LARGEFILE=yes
283 else 284 else
284 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then 285 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
285 @@ -5793,7 +5868,9 @@ fi 286 @@ -5793,7 +5869,9 @@ fi
286 287
287 # detect OpenSSL 288 # detect OpenSSL
288 if [ "$CFG_OPENSSL" != "no" ]; then 289 if [ "$CFG_OPENSSL" != "no" ]; then
289 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 290 - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
290 + if [ "$XPLATFORM" = "win32-g++" ]; then 291 + if [ "$XPLATFORM" = "win32-g++" ]; then
291 + echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there." 292 + echo "We cannot test for system CFG_OPENSSL since we are cross building for win32-g++, so we assume it is there."
292 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 293 + elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
293 if [ "$CFG_OPENSSL" = "auto" ]; then 294 if [ "$CFG_OPENSSL" = "auto" ]; then
294 CFG_OPENSSL=yes 295 CFG_OPENSSL=yes
295 fi 296 fi
296 @@ -6141,6 +6218,7 @@ fi 297 @@ -6141,6 +6219,7 @@ fi
297 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" 298 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
298 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse" 299 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
299 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2" 300 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
300 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti" 301 +[ "$CFG_RTTI" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG rtti"
301 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" 302 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
302 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" 303 [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
303 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" 304 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
304 @@ -6222,11 +6300,12 @@ else 305 @@ -6222,11 +6301,12 @@ else
305 QT_CONFIG="$QT_CONFIG freetype" 306 QT_CONFIG="$QT_CONFIG freetype"
306 fi 307 fi
307 308
308 -if [ "x$PLATFORM_MAC" = "xyes" ]; then 309 -if [ "x$PLATFORM_MAC" = "xyes" ]; then
309 - #On Mac we implicitly link against libz, so we 310 - #On Mac we implicitly link against libz, so we
317 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" 318 +# [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system"
318 +#fi 319 +#fi
319 if [ "$CFG_ZLIB" = "yes" ]; then 320 if [ "$CFG_ZLIB" = "yes" ]; then
320 QT_CONFIG="$QT_CONFIG zlib" 321 QT_CONFIG="$QT_CONFIG zlib"
321 elif [ "$CFG_ZLIB" = "system" ]; then 322 elif [ "$CFG_ZLIB" = "system" ]; then
322 @@ -7161,7 +7240,7 @@ fi 323 @@ -7161,7 +7241,7 @@ fi
323 324
324 cat >>"$QTCONFIG.tmp" <<EOF 325 cat >>"$QTCONFIG.tmp" <<EOF
325 #configuration 326 #configuration
326 -CONFIG += $QTCONFIG_CONFIG 327 -CONFIG += $QTCONFIG_CONFIG
327 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG 328 +CONFIG += $QMAKE_CONFIG $QTCONFIG_CONFIG
328 QT_ARCH = $CFG_ARCH 329 QT_ARCH = $CFG_ARCH
329 QT_EDITION = $Edition 330 QT_EDITION = $Edition
330 QT_CONFIG += $QT_CONFIG 331 QT_CONFIG += $QT_CONFIG
331 @@ -7434,7 +7513,7 @@ fi 332 @@ -7434,7 +7514,7 @@ fi
332 echo "Declarative module .. $CFG_DECLARATIVE" 333 echo "Declarative module .. $CFG_DECLARATIVE"
333 echo "STL support ......... $CFG_STL" 334 echo "STL support ......... $CFG_STL"
334 echo "PCH support ......... $CFG_PRECOMPILE" 335 echo "PCH support ......... $CFG_PRECOMPILE"
335 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}" 336 -echo "MMX/3DNOW/SSE/SSE2.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
336 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}" 337 +echo "MMX/3DNOW/SSE/SSE2/RTTI.. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_RTTI}"
337 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then 338 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
338 echo "iWMMXt support ...... ${CFG_IWMMXT}" 339 echo "iWMMXt support ...... ${CFG_IWMMXT}"
339 echo "NEON support ........ ${CFG_NEON}" 340 echo "NEON support ........ ${CFG_NEON}"
340 @@ -7752,7 +7831,11 @@ for file in .projects .projects.3; do 341 @@ -7752,7 +7832,11 @@ for file in .projects .projects.3; do
341 [ "$IN_ROOT" = "no" ] && continue 342 [ "$IN_ROOT" = "no" ] && continue
342 343
343 case $a in 344 case $a in
344 - *winmain/winmain.pro) continue ;; 345 - *winmain/winmain.pro) continue ;;
345 + *winmain/winmain.pro) 346 + *winmain/winmain.pro)