|
diff --git a/configure b/configure index 3b474c6..1652527 100755 --- a/ configure+++ b/ configure |
|
@@ -8,48 +8,59 @@ |
8 | PLATFORM=generic |
8 | PLATFORM=generic |
9 | SHARING=shared |
9 | SHARING=shared |
10 | DEBUG= |
10 | DEBUG= |
11 | QCONFIGARG= |
11 | QCONFIGARG= |
12 | |
12 | |
13 | touch .test.qpe. |
13 | touch .test.qpe. |
14 | if [ '!' -f ${OPIEDIR}/.test.qpe. ]; |
14 | if [ '!' -f ${OPIEDIR}/.test.qpe. ]; |
15 | then |
15 | then |
16 | rm .test.qpe. |
16 | rm .test.qpe. |
17 | echo |
17 | echo |
18 | echo |
18 | echo |
19 | echo ' The environment variable $OPIEDIR is not set correctly. It is currently' |
19 | echo ' The environment variable $OPIEDIR is not set correctly. It is currently' |
20 | echo ' set to "'$OPIEDIR'", but it should be set to this directory,' |
20 | echo ' set to "'$OPIEDIR'", but it should be set to this directory,' |
21 | echo ' which is "'`pwd`'".' |
21 | echo ' which is "'`pwd`'".' |
22 | echo |
22 | echo |
23 | echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' |
23 | echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' |
24 | echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' |
24 | echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' |
25 | echo ' will need to log out and log in again to make the setting effective.' |
25 | echo ' will need to log out and log in again to make the setting effective.' |
26 | echo |
26 | echo |
27 | echo |
27 | echo |
28 | exit 1 |
28 | exit 1 |
29 | fi |
29 | fi |
30 | rm .test.qpe. |
30 | rm .test.qpe. |
31 | |
31 | |
| |
32 | if [ '!' -f $TMAKEPATH/tmake.conf ] |
| |
33 | then |
| |
34 | # You have tmake. We'll regenerate the file for you... |
| |
35 | echo ' The environment variable $TMAKEPATH is not set correclty. ' |
| |
36 | echo ' It should be set to the tmake path' |
| |
37 | echo |
| |
38 | echo ' Please read the INSTALL file for instructions on how to set $TMAKEPATH' |
| |
39 | echo ' to the environment variable correctly.' |
| |
40 | exit 1 |
| |
41 | fi |
| |
42 | |
32 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h) |
43 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <library/version.h) |
33 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h) |
44 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <library/version.h) |
34 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h) |
45 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <library/version.h) |
35 | |
46 | |
36 | TOMAKE= |
47 | TOMAKE= |
37 | |
48 | |
38 | if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h |
49 | if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h |
39 | then |
50 | then |
40 | QT3=yes |
51 | QT3=yes |
41 | else |
52 | else |
42 | QT3=no |
53 | QT3=no |
43 | fi |
54 | fi |
44 | |
55 | |
45 | # Parse the arguments, setting things to "yes" or "no". |
56 | # Parse the arguments, setting things to "yes" or "no". |
46 | |
57 | |
47 | while [ -n "$1" ]; do |
58 | while [ -n "$1" ]; do |
48 | case $1 in |
59 | case $1 in |
49 | -platform|-xplatform) # No difference since we don't need to build moc, etc. |
60 | -platform|-xplatform) # No difference since we don't need to build moc, etc. |
50 | shift; PLATFORM=$1 |
61 | shift; PLATFORM=$1 |
51 | ;; |
62 | ;; |
52 | -release) |
63 | -release) |
53 | DEBUG= |
64 | DEBUG= |
54 | ;; |
65 | ;; |
55 | -debug) |
66 | -debug) |
|