summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-06-04 07:25:35 (GMT)
committerAndreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>2010-06-04 07:27:05 (GMT)
commite7b977a323b634bab9d4b09be79cc99af25b6424 (patch)
treeab6773d040c592afa1543d70dd4c115b0a6c3386 /configure
parent6078c083c0aca4d3b5b652fccce7b27de083c890 (diff)
downloadQt-e7b977a323b634bab9d4b09be79cc99af25b6424.zip
Qt-e7b977a323b634bab9d4b09be79cc99af25b6424.tar.gz
Qt-e7b977a323b634bab9d4b09be79cc99af25b6424.tar.bz2
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>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index 0db2236..991596f 100755
--- a/configure
+++ b/configure
@@ -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