Commit af5db58e8b8a997fb3849046ec1f5df4527ff8b8

Authored by pbrook
1 parent 7783e9f0

Move configure --help output before gcc checks.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1798 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 1 changed file with 43 additions and 43 deletions
configure
... ... @@ -227,6 +227,49 @@ if test -z "$CFLAGS"; then
227 227 CFLAGS="-O2"
228 228 fi
229 229  
  230 +if test x"$show_help" = x"yes" ; then
  231 +cat << EOF
  232 +
  233 +Usage: configure [options]
  234 +Options: [defaults in brackets after descriptions]
  235 +
  236 +EOF
  237 +echo "Standard options:"
  238 +echo " --help print this message"
  239 +echo " --prefix=PREFIX install in PREFIX [$prefix]"
  240 +echo " --interp-prefix=PREFIX where to find shared libraries, etc."
  241 +echo " use %M for cpu name [$interp_prefix]"
  242 +echo " --target-list=LIST set target list [$target_list]"
  243 +echo ""
  244 +echo "kqemu kernel acceleration support:"
  245 +echo " --disable-kqemu disable kqemu support"
  246 +echo " --kernel-path=PATH set the kernel path (configure probes it)"
  247 +echo ""
  248 +echo "Advanced options (experts only):"
  249 +echo " --source-path=PATH path of source code [$source_path]"
  250 +echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
  251 +echo " --cc=CC use C compiler CC [$cc]"
  252 +echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc."
  253 +echo " --make=MAKE use specified make [$make]"
  254 +echo " --static enable static build [$static]"
  255 +echo " --enable-cocoa enable COCOA (Mac OS X only)"
  256 +echo " --enable-mingw32 enable Win32 cross compilation with mingw32"
  257 +echo " --enable-adlib enable Adlib emulation"
  258 +echo " --enable-coreaudio enable Coreaudio audio driver"
  259 +echo " --enable-alsa enable ALSA audio driver"
  260 +echo " --enable-fmod enable FMOD audio driver"
  261 +echo " --enabled-dsound enable DirectSound audio driver"
  262 +echo " --enable-system enable all system emulation targets"
  263 +echo " --disable-system disable all system emulation targets"
  264 +echo " --enable-user enable all linux usermode emulation targets"
  265 +echo " --disable-user disable all linux usermode emulation targets"
  266 +echo " --fmod-lib path to FMOD library"
  267 +echo " --fmod-inc path to FMOD includes"
  268 +echo ""
  269 +echo "NOTE: The object files are build at the place where configure is launched"
  270 +exit 1
  271 +fi
  272 +
230 273 cc="${cross_prefix}${cc}"
231 274 ar="${cross_prefix}${ar}"
232 275 strip="${cross_prefix}${strip}"
... ... @@ -370,49 +413,6 @@ fi # sdl compile test
370 413 fi # cross compilation
371 414 fi # -z $sdl
372 415  
373   -if test x"$show_help" = x"yes" ; then
374   -cat << EOF
375   -
376   -Usage: configure [options]
377   -Options: [defaults in brackets after descriptions]
378   -
379   -EOF
380   -echo "Standard options:"
381   -echo " --help print this message"
382   -echo " --prefix=PREFIX install in PREFIX [$prefix]"
383   -echo " --interp-prefix=PREFIX where to find shared libraries, etc."
384   -echo " use %M for cpu name [$interp_prefix]"
385   -echo " --target-list=LIST set target list [$target_list]"
386   -echo ""
387   -echo "kqemu kernel acceleration support:"
388   -echo " --disable-kqemu disable kqemu support"
389   -echo " --kernel-path=PATH set the kernel path (configure probes it)"
390   -echo ""
391   -echo "Advanced options (experts only):"
392   -echo " --source-path=PATH path of source code [$source_path]"
393   -echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
394   -echo " --cc=CC use C compiler CC [$cc]"
395   -echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc."
396   -echo " --make=MAKE use specified make [$make]"
397   -echo " --static enable static build [$static]"
398   -echo " --enable-cocoa enable COCOA (Mac OS X only)"
399   -echo " --enable-mingw32 enable Win32 cross compilation with mingw32"
400   -echo " --enable-adlib enable Adlib emulation"
401   -echo " --enable-coreaudio enable Coreaudio audio driver"
402   -echo " --enable-alsa enable ALSA audio driver"
403   -echo " --enable-fmod enable FMOD audio driver"
404   -echo " --enabled-dsound enable DirectSound audio driver"
405   -echo " --enable-system enable all system emulation targets"
406   -echo " --disable-system disable all system emulation targets"
407   -echo " --enable-user enable all linux usermode emulation targets"
408   -echo " --disable-user disable all linux usermode emulation targets"
409   -echo " --fmod-lib path to FMOD library"
410   -echo " --fmod-inc path to FMOD includes"
411   -echo ""
412   -echo "NOTE: The object files are build at the place where configure is launched"
413   -exit 1
414   -fi
415   -
416 416 if test "$mingw32" = "yes" ; then
417 417 if test -z "$prefix" ; then
418 418 prefix="/c/Program Files/Qemu"
... ...