From nobody Fri Apr 26 10:49:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578557841; cv=none; d=zohomail.com; s=zohoarc; b=ZFCmfxqjbjpwRSAlY+Ly3d1p+kog32VmnXduH1vaFzm42MyTkUNLkWrnOOvgeQS0ucNBZJTRDa7KS0FVJUtgsClvX3YKW1dry1BcZ05IHnHuWSoRA2f8ZFG6FMpJfLgB4r60o6ygIJd42Z6bkDAto0JvqFwp01us2QR+IbFR3oA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578557841; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IlmqOdAi6k8UQP3HeJLmEm92BRMdZi79JWwECIMjB64=; b=BZeksrkSu4m8XnwOym5hS0TdZD2QevwlJ5NcGRGW20PRTEcoN+RanEKE/OA3/WrCYnleytYG18xYDzOxAh0XVVWr0mDJG5a4gOOAW03zYbsLJrzN+PUvIFJC5XercPwZ02HBU32oAWqaqOlRkuLIskEuh5hIEyvuTpdhBoKd/ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1578557841720313.56674937581295; Thu, 9 Jan 2020 00:17:21 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-KIm87cU5PRGBy4aBfZjpfQ-1; Thu, 09 Jan 2020 03:17:19 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CD7A184B1E9; Thu, 9 Jan 2020 08:17:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B1DC272A3; Thu, 9 Jan 2020 08:17:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0045C180880D; Thu, 9 Jan 2020 08:17:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0098Gx92014510 for ; Thu, 9 Jan 2020 03:16:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id 76D981000328; Thu, 9 Jan 2020 08:16:59 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 002CD1001B2C for ; Thu, 9 Jan 2020 08:16:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578557840; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=IlmqOdAi6k8UQP3HeJLmEm92BRMdZi79JWwECIMjB64=; b=gvuZD4C6L2L27IZ0s3BLirkEwkzC7P3WveF84AMq8UsMe2TfOFll2FovYOOZjKrzVWSset ZSwAlMZKE0dfhSxHSkokM1wFwiJigUTZgeaxWKSDP7GgYd36104kXW9VS9MiSNwQ/v7p05 WUP12MkMqI7TubqdNVxdS/KrL60UX1Y= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 09:16:41 +0100 Message-Id: <65d00f901cd6ade0cd42bc0c973cedd6f9f97401.1578556319.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/16] autogen.sh: move --system option to configure as --with-system X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: KIm87cU5PRGBy4aBfZjpfQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" As preparation to run configure directly when building libvirt. Signed-off-by: Pavel Hrdina --- autogen.sh | 22 ++++------------------ configure.ac | 14 ++++++++++++++ docs/compiling.html.in | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/autogen.sh b/autogen.sh index 47446dc785..75e8b70d4e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -23,7 +23,6 @@ test -f src/libvirt.c || { dry_run=3D no_git=3D gnulib_srcdir=3D -extra_args=3D while test "$#" -gt 0; do case "$1" in --dry-run) @@ -48,19 +47,6 @@ while test "$#" -gt 0; do shift shift ;; - --system) - prefix=3D/usr - sysconfdir=3D/etc - localstatedir=3D/var - if test -d $prefix/lib64; then - libdir=3D$prefix/lib64 - else - libdir=3D$prefix/lib - fi - extra_args=3D"--prefix=3D$prefix --localstatedir=3D$localstatedir" - extra_args=3D"$extra_args --sysconfdir=3D$sysconfdir --libdir=3D$l= ibdir" - shift - ;; *) # All remaining arguments will be passed to configure verbatim break @@ -187,19 +173,19 @@ test "$MAKE" || { die "GNU make is required to build libvirt" } =20 -if test -z "$*" && test -z "$extra_args" && test -f config.status; then +if test -z "$*" && test -f config.status; then echo "Running config.status..." ./config.status --recheck || { die "config.status failed" } else - if test -z "$*" && test -z "$extra_args"; then + if test -z "$*"; then echo "I am going to run configure with no arguments - if you wish" echo "to pass any to it, please specify them on the $0 command lin= e." else - echo "Running configure with $extra_args $@" + echo "Running configure with $@" fi - "$srcdir/configure" $extra_args "$@" || { + "$srcdir/configure" "$@" || { die "configure failed" } fi diff --git a/configure.ac b/configure.ac index 2be909b7ce..d5926b9b90 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,20 @@ then runstatedir=3D$with_runstatedir fi =20 +LIBVIRT_ARG_WITH([SYSTEM], + [configure libvirt to be compatible with normal OS vendor= prefixes], + [no]) +if test "x$with_system" !=3D "xno"; then + prefix=3D/usr + sysconfdir=3D/etc + localstatedir=3D/var + if test -d $prefix/lib64; then + libdir=3D$prefix/lib64 + else + libdir=3D$prefix/lib + fi +fi + =20 gl_EARLY gl_INIT diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 5869ebb90f..3731bf0873 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -113,7 +113,7 @@ $ sudo make install

=20 
-$ ./autogen.sh --system
+$ ./autogen.sh --with-system
 $ make
=20 --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list