From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNLrK-0005G4-2o for qemu-devel@nongnu.org; Tue, 11 Mar 2014 08:32:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNLrF-0006tC-BX for qemu-devel@nongnu.org; Tue, 11 Mar 2014 08:32:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNLrF-0006t8-3M for qemu-devel@nongnu.org; Tue, 11 Mar 2014 08:32:33 -0400 Date: Tue, 11 Mar 2014 14:32:27 +0200 From: "Michael S. Tsirkin" Message-ID: <1394537675-30618-4-git-send-email-mst@redhat.com> References: <1394537675-30618-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1394537675-30618-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 3/6] configure: don't modify .status on error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori ./configure --help make will try to re-run configure with --help which isn't what was intended. The reason is that config.status was written even on configure error. Defer writing config.status until configure has completed successfully. Signed-off-by: Michael S. Tsirkin Reviewed-by: Peter Maydell --- configure | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 8689435..3ae57d7 100755 --- a/configure +++ b/configure @@ -31,19 +31,6 @@ printf " '%s'" "$0" "$@" >> config.log echo >> config.log echo "#" >> config.log -# Save the configure command line for later reuse. -cat <config.status -#!/bin/sh -# Generated by configure. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. -EOD -printf "exec" >>config.status -printf " '%s'" "$0" "$@" >>config.status -echo >>config.status -chmod +x config.status - error_exit() { echo echo "ERROR: $1" @@ -5136,3 +5123,17 @@ done if test "$docs" = "yes" ; then mkdir -p QMP fi + +# Save the configure command line for later reuse. +cat <config.status +#!/bin/sh +# Generated by configure. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. +EOD +printf "exec" >>config.status +printf " '%s'" "$0" "$@" >>config.status +echo >>config.status +chmod +x config.status + -- MST