diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-11 15:36:48 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-11 15:36:48 +0100 |
| commit | c5cb1afc4675bf5ff66e7a149d2a8cffba2eaa9e (patch) | |
| tree | 37b28935513fd5afdc5d08bc4f16ed9635272db3 /configure | |
| parent | b780bf8eff43fc49b071795292dea5d05990fff3 (diff) | |
| parent | 1c33ac5716af0840d8a2c568a47bcbee51946d69 (diff) | |
| download | focaccia-qemu-c5cb1afc4675bf5ff66e7a149d2a8cffba2eaa9e.tar.gz focaccia-qemu-c5cb1afc4675bf5ff66e7a149d2a8cffba2eaa9e.zip | |
Merge remote-tracking branch 'remotes/bonzini/configure' into staging
* remotes/bonzini/configure: rules.mak: Rewrite unnest-vars configure: unset interfering variables configure: duplicate/incorrect order of -lrt libcacard: improve documentation libcacard: actually use symbols file libcacard: replace qemu thread primitives with glib ones vscclient: use glib thread primitives not qemu glib-compat.h: add new thread API emulation on top of pre-2.31 API Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure b/configure index a994f4196f..b93cce816a 100755 --- a/configure +++ b/configure @@ -3,6 +3,11 @@ # qemu configure script (c) 2003 Fabrice Bellard # +# Unset some variables known to interfere with behavior of common tools, +# just as autoconf does. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + # Temporary directory used for files created while # configure runs. Since it is in the build directory # we can safely blow away any previous version of it @@ -3452,9 +3457,9 @@ EOF if compile_prog "" "" ; then : # we need pthread for static linking. use previous pthread test result -elif compile_prog "" "-lrt $pthread_lib" ; then - LIBS="-lrt $LIBS" - libs_qga="-lrt $libs_qga" +elif compile_prog "" "$pthread_lib -lrt" ; then + LIBS="$LIBS -lrt" + libs_qga="$libs_qga -lrt" fi if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ |