File tree 1 file changed +40
-2
lines changed
1 file changed +40
-2
lines changed Original file line number Diff line number Diff line change @@ -136,9 +136,17 @@ validate_opt () {
136
136
isArgValid=1
137
137
fi
138
138
done
139
- if test $isArgValid -eq 0
139
+ if [ " $arg " = " --help " ]
140
140
then
141
- err " Option '$arg ' is not recognized"
141
+ echo " "
142
+ echo " No more help available for Configure options,"
143
+ echo " check the Wiki or join our IRC channel"
144
+ break
145
+ else
146
+ if test $isArgValid -eq 0
147
+ then
148
+ err " Option '$arg ' is not recognized"
149
+ fi
142
150
fi
143
151
done
144
152
}
@@ -266,13 +274,42 @@ case $CFG_OSTYPE in
266
274
MINGW32* )
267
275
CFG_OSTYPE=pc-mingw32
268
276
;;
277
+ # Thad's Cygwin identifers below
278
+
279
+ # Vista 32 bit
280
+ CYGWIN_NT-6.0)
281
+ CFG_OSTYPE=pc-mingw32
282
+ CFG_CPUTYPE=i686
283
+ ;;
284
+
285
+ # Vista 64 bit
286
+ CYGWIN_NT-6.0-WOW64)
287
+ CFG_OSTYPE=w64-mingw32
288
+ CFG_CPUTYPE=x86_64
289
+ ;;
290
+
291
+ # Win 7 32 bit
292
+ CYGWIN_NT-6.1)
293
+ CFG_OSTYPE=pc-mingw32
294
+ CFG_CPUTYPE=i686
295
+ ;;
269
296
297
+ # Win 7 64 bit
298
+ CYGWIN_NT-6.1-WOW64)
299
+ CFG_OSTYPE=w64-mingw32
300
+ CFG_CPUTYPE=x86_64
301
+ ;;
302
+
303
+ # We do not detect other OS such as XP/2003 using 64 bit using uname.
304
+ # If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
270
305
* )
271
306
err " unknown OS type: $CFG_OSTYPE "
272
307
;;
273
308
esac
274
309
275
310
311
+ if [ -z " $CFG_CPUTYPE " ]
312
+ then
276
313
case $CFG_CPUTYPE in
277
314
278
315
i386 | i486 | i686 | i786 | x86)
@@ -290,6 +327,7 @@ case $CFG_CPUTYPE in
290
327
* )
291
328
err " unknown CPU type: $CFG_CPUTYPE "
292
329
esac
330
+ fi
293
331
294
332
# Detect 64 bit linux systems with 32 bit userland and force 32 bit compilation
295
333
if [ $CFG_OSTYPE = unknown-linux-gnu -a $CFG_CPUTYPE = x86_64 ]
You can’t perform that action at this time.
0 commit comments