Revision 1d14ffa9 configure

b/configure
77 77
slirp="yes"
78 78
adlib="no"
79 79
oss="no"
80
dsound="no"
81
coreaudio="no"
82
alsa="no"
80 83
fmod="no"
81 84
fmod_lib=""
82 85
fmod_inc=""
......
115 118
bsd="yes"
116 119
darwin="yes"
117 120
;;
118
*) 
121
*)
119 122
oss="yes"
120 123
linux="yes"
121 124
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
......
131 134
fi
132 135

  
133 136
# find source path
134
# XXX: we assume an absolute path is given when launching configure, 
137
# XXX: we assume an absolute path is given when launching configure,
135 138
# except in './configure' case.
136 139
source_path=${0%configure}
137 140
source_path=${source_path%/}
......
171 174
  ;;
172 175
  --disable-sdl) sdl="no"
173 176
  ;;
177
  --enable-coreaudio) coreaudio="yes"
178
  ;;
179
  --enable-alsa) alsa="yes"
180
  ;;
181
  --enable-dsound) dsound="yes"
182
  ;;
174 183
  --enable-fmod) fmod="yes"
175 184
  ;;
176 185
  --fmod-lib=*) fmod_lib=${opt#--fmod-lib=}
......
178 187
  --fmod-inc=*) fmod_inc=${opt#--fmod-inc=}
179 188
  ;;
180 189
  --enable-mingw32) mingw32="yes" ; cross_prefix="i386-mingw32-"
181
  ;; 
190
  ;;
182 191
  --disable-slirp) slirp="no"
183
  ;; 
192
  ;;
184 193
  --enable-adlib) adlib="yes"
185
  ;; 
194
  ;;
186 195
  --disable-kqemu) kqemu="no"
187
  ;; 
196
  ;;
188 197
  --kernel-path=*) kernel_path=${opt#--kernel-path=}
189
  ;; 
190
  --enable-cocoa) cocoa="yes" ; sdl="no"
191
  ;; 
198
  ;;
199
  --enable-cocoa) cocoa="yes" ; coreaudio="yes" ; sdl="no"
200
  ;;
192 201
  --disable-gfx-check) check_gfx="no"
193 202
  ;;
194 203
  esac
......
231 240
cat > $TMPC << EOF
232 241
#include <inttypes.h>
233 242
int main(int argc, char ** argv){
234
	volatile uint32_t i=0x01234567;
235
	return (*((uint8_t*)(&i))) == 0x67;
243
        volatile uint32_t i=0x01234567;
244
        return (*((uint8_t*)(&i))) == 0x67;
236 245
}
237 246
EOF
238 247

  
......
346 355
echo "  --static                 enable static build [$static]"
347 356
echo "  --enable-mingw32         enable Win32 cross compilation with mingw32"
348 357
echo "  --enable-adlib           enable Adlib emulation"
349
echo "  --enable-fmod            enable FMOD audio output driver"
358
echo "  --enable-coreaudio       enable Coreaudio audio driver"
359
echo "  --enable-alsa            enable ALSA audio driver"
360
echo "  --enable-fmod            enable FMOD audio driver"
361
echo "  --enabled-dsound         enable DirectSound audio driver"
350 362
echo "  --fmod-lib               path to FMOD library"
351 363
echo "  --fmod-inc               path to FMOD includes"
352 364
echo ""
......
375 387
# kqemu support
376 388
if test $kqemu = "yes" ; then
377 389
    # test if the source code is installed
378
    if test '!' -f "kqemu/Makefile" ; then 
390
    if test '!' -f "kqemu/Makefile" ; then
379 391
        kqemu="no"
380 392
    fi
381 393
fi
382
  
394

  
383 395
# Linux specific kqemu configuration
384 396
if test $kqemu = "yes" -a $linux = "yes" ; then
385 397
# find the kernel path
386 398
if test -z "$kernel_path" ; then
387 399
kernel_version=`uname -r`
388 400
kernel_path="/lib/modules/$kernel_version/build"
389
if test '!' -d "$kernel_path/include" ; then 
401
if test '!' -d "$kernel_path/include" ; then
390 402
    kernel_path="/usr/src/linux"
391
    if test '!' -d "$kernel_path/include" ; then 
403
    if test '!' -d "$kernel_path/include" ; then
392 404
        echo "Could not find kernel includes in /lib/modules or /usr/src/linux - cannot build the kqemu module"
393 405
        kqemu="no"
394 406
    fi
......
401 413
if test '!' -f "$kernel_path/Makefile" ; then
402 414
    echo "No Makefile file present in $kernel_path - kqemu cannot be built"
403 415
    kqemu="no"
404
fi    
416
fi
405 417

  
406 418
# find build system (2.6 or legacy)
407 419
kbuild26="yes"
......
439 451
fi
440 452
echo "mingw32 support   $mingw32"
441 453
echo "Adlib support     $adlib"
454
echo "CoreAudio support $coreaudio"
455
echo "ALSA support      $alsa"
456
echo "DSound support    $dsound"
442 457
echo -n "FMOD support      $fmod"
443
if test $fmod = "yes"; then
458
if test "$fmod" = "yes"; then
459
    if test -z $fmod_lib || test -z $fmod_inc; then
460
        echo
461
        echo "Error: You must specify path to FMOD library and headers"
462
        echo "Example: --fmod-inc=/path/include/fmod --fmod-lib=/path/lib/libfmod-3.74.so"
463
        echo
464
        exit 1
465
    fi
444 466
    echo -n " (lib='$fmod_lib' include='$fmod_inc')"
445 467
fi
446 468
echo ""
......
568 590
  echo "CONFIG_OSS=yes" >> $config_mak
569 591
  echo "#define CONFIG_OSS 1" >> $config_h
570 592
fi
593
if test "$coreaudio" = "yes" ; then
594
  echo "CONFIG_COREAUDIO=yes" >> $config_mak
595
  echo "#define CONFIG_COREAUDIO 1" >> $config_h
596
fi
597
if test "$alsa" = "yes" ; then
598
  echo "CONFIG_ALSA=yes" >> $config_mak
599
  echo "#define CONFIG_ALSA 1" >> $config_h
600
fi
601
if test "$dsound" = "yes" ; then
602
  echo "CONFIG_DSOUND=yes" >> $config_mak
603
  echo "#define CONFIG_DSOUND 1" >> $config_h
604
fi
571 605
if test "$fmod" = "yes" ; then
572 606
  echo "CONFIG_FMOD=yes" >> $config_mak
573 607
  echo "CONFIG_FMOD_LIB=$fmod_lib" >> $config_mak
......
600 634
  echo "#define _BSD 1" >> $config_h
601 635
fi
602 636

  
603
for target in $target_list; do 
637
for target in $target_list; do
604 638

  
605 639
target_dir="$target"
606 640
config_mak=$target_dir/config.mak
......
623 657
fi
624 658

  
625 659
if test "$target_user_only" = "no" -a "$check_gfx" = "yes" \
626
	-a "$sdl" = "no" -a "$cocoa" = "no" ; then
660
        -a "$sdl" = "no" -a "$cocoa" = "no" ; then
627 661
    echo "ERROR: QEMU requires SDL or Cocoa for graphical output"
628 662
    echo "To build QEMU with graphical output configure with --disable-gfx-check"
629 663
    echo "Note that this will disable all output from the virtual graphics card."

Also available in: Unified diff