|
diff --git a/configure b/configure index 0241adf..299e867 100755 --- a/ configure+++ b/ configure |
|
@@ -104,52 +104,54 @@ then |
104 | fi |
104 | fi |
105 | |
105 | |
106 | # Next, emit a usage message if something failed. |
106 | # Next, emit a usage message if something failed. |
107 | |
107 | |
108 | if [ "$HELP" = "yes" ]; then |
108 | if [ "$HELP" = "yes" ]; then |
109 | cat <<EOF |
109 | cat <<EOF |
110 | Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] |
110 | Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] |
111 | |
111 | |
112 | The defaults (*) are usually acceptable. Here is a short explanation of |
112 | The defaults (*) are usually acceptable. Here is a short explanation of |
113 | each option: |
113 | each option: |
114 | |
114 | |
115 | * -release ........... Compile and link Qt with debugging turned off. |
115 | * -release ........... Compile and link Qt with debugging turned off. |
116 | -debug ............. Compile and link Qt with debugging turned on. |
116 | -debug ............. Compile and link Qt with debugging turned on. |
117 | |
117 | |
118 | * -shared ............ Create and use a shared Qt library (libqt.so) |
118 | * -shared ............ Create and use a shared Qt library (libqt.so) |
119 | -static ............ Create and use a static Qt library (libqt.a) |
119 | -static ............ Create and use a static Qt library (libqt.a) |
120 | |
120 | |
121 | -qt3 ............... Configure for use with Qt 3.x |
121 | -qt3 ............... Configure for use with Qt 3.x |
122 | |
122 | |
123 | -platform target ... The platform you are building on ($PLATFORM) |
123 | -platform target ... The platform you are building on ($PLATFORM) |
124 | EOF |
124 | EOF |
125 | exit 0; |
125 | exit 0; |
126 | fi |
126 | fi |
127 | |
127 | |
128 | if [ -f library/custom-$PLATFORM.h ] |
128 | CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"` |
| |
129 | |
| |
130 | if [ -f library/custom-$CUSTOM.h ] |
129 | then |
131 | then |
130 | rm -f library/custom.h |
132 | rm -f library/custom.h |
131 | ln -s custom-$PLATFORM.h library/custom.h |
133 | ln -s custom-$CUSTOM.h library/custom.h |
132 | fi |
134 | fi |
133 | |
135 | |
134 | mkdir -p include/qpe |
136 | mkdir -p include/qpe |
135 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
137 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
136 | |
138 | |
137 | mkdir -p include/opie |
139 | mkdir -p include/opie |
138 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
140 | ( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) |
139 | |
141 | |
140 | |
142 | |
141 | echo Creating makefiles... |
143 | echo Creating makefiles... |
142 | |
144 | |
143 | sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
145 | sed -e 's/^\(VERSION.*= \).*/\1'$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT/ <library/library.pro >library/library.pro-v |
144 | mv library/library.pro-v library/library.pro |
146 | mv library/library.pro-v library/library.pro |
145 | |
147 | |
146 | if [ "$QT3" = yes ] |
148 | if [ "$QT3" = yes ] |
147 | then |
149 | then |
148 | VCONFIG="CONFIG+=qt3" |
150 | VCONFIG="CONFIG+=qt3" |
149 | else |
151 | else |
150 | VCONFIG="CONFIG+=qt2" |
152 | VCONFIG="CONFIG+=qt2" |
151 | fi |
153 | fi |
152 | |
154 | |
153 | if [ -f $TMAKEPATH/tmake.conf ] |
155 | if [ -f $TMAKEPATH/tmake.conf ] |
154 | then |
156 | then |
155 | # You have tmake. We'll regenerate the file for you... |
157 | # You have tmake. We'll regenerate the file for you... |
|