diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-06-04 09:25:35 +0200 |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-06-04 09:27:05 +0200 |
| commit | e7b977a323b634bab9d4b09be79cc99af25b6424 (patch) | |
| tree | ab6773d040c592afa1543d70dd4c115b0a6c3386 | |
| parent | 6078c083c0aca4d3b5b652fccce7b27de083c890 (diff) | |
Search local directory if no qconfig file found in src/corelib/global/
configure script searched qconfig-local.h under src/corelib/global/
with "-qconfig local". After this commit, configure tries to find local
directory if the file is not found in the path.
Now you can pass the option like "-qconfig ./qconfig-myconfig.h"
Merge-request: 2341
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
| -rwxr-xr-x | configure | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -2201,9 +2201,11 @@ minimal|small|medium|large|full) ;; *) # not known to be sufficient for anything - if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ]; then + if [ '!' -f "$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" ] && [ '!' -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then echo >&2 "Error: configuration file not found:" echo >&2 " $relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h" + echo >&2 " or" + echo >&2 " `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"`" OPT_HELP=yes fi esac @@ -7229,7 +7231,11 @@ full) *) tmpconfig="$outpath/src/corelib/global/qconfig.h.new" echo "#ifndef QT_BOOTSTRAPPED" >"$tmpconfig" - cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig" + if [ -f "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" ]; then + cat "$relpath/src/corelib/global/qconfig-$CFG_QCONFIG.h" >>"$tmpconfig" + elif [ -f `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` ]; then + cat `"$relpath/config.tests/unix/makeabs" "${CFG_QCONFIG}"` >>"$tmpconfig" + fi echo "#endif" >>"$tmpconfig" ;; esac |