summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 8b0f37e..df8250e 100755
--- a/configure
+++ b/configure
@@ -110,64 +110,65 @@ if [ "$HELP" = "yes" ]; then
110 cat <<EOF 110 cat <<EOF
111Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...] 111Usage: $0 [-debug] [-release] [-shared] [-static] [-qt3] [-platform ...]
112 112
113The defaults (*) are usually acceptable. Here is a short explanation of 113The defaults (*) are usually acceptable. Here is a short explanation of
114each option: 114each option:
115 115
116 * -release ........... Compile and link Qt with debugging turned off. 116 * -release ........... Compile and link Qt with debugging turned off.
117 -debug ............. Compile and link Qt with debugging turned on. 117 -debug ............. Compile and link Qt with debugging turned on.
118 118
119 * -shared ............ Create and use a shared Qt library (libqt.so) 119 * -shared ............ Create and use a shared Qt library (libqt.so)
120 -static ............ Create and use a static Qt library (libqt.a) 120 -static ............ Create and use a static Qt library (libqt.a)
121 121
122 -qt3 ............... Configure for use with Qt 3.x 122 -qt3 ............... Configure for use with Qt 3.x
123 123
124 -platform target ... The platform you are building on ($PLATFORM) 124 -platform target ... The platform you are building on ($PLATFORM)
125EOF 125EOF
126 exit 0; 126 exit 0;
127fi 127fi
128 128
129CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"` 129CUSTOM=`echo $PLATFORM | sed -n -e "s/.*-\(.*\)-.*/\1/p"`
130 130
131if [ -f library/custom-$CUSTOM.h ] 131if [ -f library/custom-$CUSTOM.h ]
132then 132then
133 rm -f library/custom.h 133 rm -f library/custom.h
134 ln -s custom-$CUSTOM.h library/custom.h 134 ln -s custom-$CUSTOM.h library/custom.h
135fi 135fi
136 136
137mkdir -p include/qpe 137mkdir -p include/qpe
138( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) 138( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; )
139 139
140mkdir -p include/opie 140mkdir -p include/opie
141( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; ) 141( cd include/opie && rm -f *.h; ln -s ../../libopie/*.h .; rm -f *_p.h; )
142( cd include/opie && ln -s ../../libsql/*.h . )
142 143
143echo Creating makefiles... 144echo Creating makefiles...
144 145
145# Set version for library directly 146# Set version for library directly
146# Version 1.5.0 right now for compat. 147# Version 1.5.0 right now for compat.
147sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v 148sed -e 's/^\(VERSION.*= \).*/\1'1.5.0.$VERSION_PAT/ <library/library.pro >library/library.pro-v
148mv library/library.pro-v library/library.pro 149mv library/library.pro-v library/library.pro
149 150
150if [ "$QT3" = yes ] 151if [ "$QT3" = yes ]
151then 152then
152 VCONFIG="CONFIG+=qt3" 153 VCONFIG="CONFIG+=qt3"
153else 154else
154 VCONFIG="CONFIG+=qt2" 155 VCONFIG="CONFIG+=qt2"
155fi 156fi
156 157
157if [ -f $TMAKEPATH/tmake.conf ] 158if [ -f $TMAKEPATH/tmake.conf ]
158then 159then
159 # You have tmake. We'll regenerate the file for you... 160 # You have tmake. We'll regenerate the file for you...
160 echo "Makefiles will be regenerated." 161 echo "Makefiles will be regenerated."
161fi 162fi
162 163
163H=`pwd` 164H=`pwd`
164if [ -z "$TOMAKE" ] 165if [ -z "$TOMAKE" ]
165then 166then
166 TOMAKE=`make showcomponents` 167 TOMAKE=`make showcomponents`
167fi 168fi
168 169
169for a in $TOMAKE ; do 170for a in $TOMAKE ; do
170 N=$a/Makefile 171 N=$a/Makefile
171 M=$a/Makefile.in 172 M=$a/Makefile.in
172 O=$a/Makefile.add 173 O=$a/Makefile.add
173 f=`basename $a` 174 f=`basename $a`