aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-06-27 11:25:23 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-06-27 11:25:23 -0500
commitbb820c03e2d638038fd48f42ee71e4004e55aba8 (patch)
tree43266acaef2a63fcd06de565a42c264a4f71e95f /configure
parent2fb0c09f4ff036f68474277ed4edc036f6529de8 (diff)
parent20fa53ece42bec6ce5db801bead125277b26ab8a (diff)
downloadqemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.zip
qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.tar.gz
qemu-bb820c03e2d638038fd48f42ee71e4004e55aba8.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index e523976..88159ac 100755
--- a/configure
+++ b/configure
@@ -1640,7 +1640,7 @@ for drv in $audio_drv_list; do
pa)
audio_drv_probe $drv pulse/simple.h "-lpulse-simple -lpulse" \
- "pa_simple *s = NULL; pa_simple_free(s); return 0;"
+ "pa_simple *s = 0; pa_simple_free(s); return 0;"
libs_softmmu="-lpulse -lpulse-simple $libs_softmmu"
audio_pt_int="yes"
;;
@@ -3483,7 +3483,9 @@ for bios_file in $source_path/pc-bios/*.bin $source_path/pc-bios/*.rom $source_p
done
mkdir -p $DIRS
for f in $FILES ; do
- test -e $f || symlink $source_path/$f $f
+ if [ -e "$source_path/$f" ] && ! [ -e "$f" ]; then
+ symlink "$source_path/$f" "$f"
+ fi
done
# temporary config to build submodules