From nobody Tue Feb 10 01:15:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1558957351; cv=none; d=zoho.com; s=zohoarc; b=LIDaI4xenhBrhqxMtD3LP6uiBUHHV1cBxtJwv+ZuVRbnwi20lpmh/Zlc0dBCsAYrb2pDoW2c0uyOpn94troMlaDz16r8bSZOgPnkHQNYl8X1/zEe/LLksWyB9OfqHyx+NBCTNwMAKaTOTJKnl65g2g7aHT4ChZnJmob54OorHeg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558957351; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=HZAONkM5SgwN4eDMrKk6eRH7OxioTbEjuNjadel/K/4=; b=Hsv3NOavdbT0qh4VJmxxflczKKBhA9lu+wKMhFUrORCKe0HF4pYVevQG5EZG/CXf5jSif3hMMWMUzRND4RlJBNSpEeYRy3DZ75bWY/i7cSD2QwL7RZzxyyLikr4+qsOr8ywJK7LnJ0q+YiZr1yP/Wwr6A7+XPeXY3kZXyZM9K3Y= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1558957351455953.0780750691026; Mon, 27 May 2019 04:42:31 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F058DF74B5; Mon, 27 May 2019 11:42:24 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C62191001E60; Mon, 27 May 2019 11:42:20 +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 89C9A206D4; Mon, 27 May 2019 11:42:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4RBfd2d025074 for ; Mon, 27 May 2019 07:41:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id E839060C75; Mon, 27 May 2019 11:41:39 +0000 (UTC) Received: from laerte.brq.redhat.com (unknown [10.43.2.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4ADB060BEC; Mon, 27 May 2019 11:41:39 +0000 (UTC) From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Mon, 27 May 2019 13:41:31 +0200 Message-Id: <20190527114132.30604-2-fidencio@redhat.com> In-Reply-To: <20190527114132.30604-1-fidencio@redhat.com> References: <20190527114132.30604-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [glib PATCH v2 1/2] autogen.sh: Simplify autogen.sh 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 27 May 2019 11:42:30 +0000 (UTC) Let's use an autogen.sh based on libosinfo's one, which is cleaner and matches the current GNOME guidelines. Signed-off-by: Fabiano Fid=C3=AAncio Reviewed-by: Andrea Bolognani --- .gitignore | 3 +++ autogen.sh | 58 +++++++++++++++++++++++------------------------------- 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index de89c4d..4b9467e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,11 +19,14 @@ Makefile.in *.la *~ *.orig +m4/gtk-doc.m4 +m4/introspection.m4 m4/ltsugar.m4 m4/lt~obsolete.m4 m4/libtool.m4 m4/ltversion.m4 m4/ltoptions.m4 +m4/pkg.m4 autom4te.cache config.* COPYING diff --git a/autogen.sh b/autogen.sh index 3b593ce..bf037f0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,43 +1,26 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=3D$(dirname "$0") +test -n "$srcdir" || srcdir=3D. =20 -set -e -srcdir=3D`dirname $0` -test -z "$srcdir" && srcdir=3D. +olddir=3D$(pwd) =20 -THEDIR=3D`pwd` -cd $srcdir +cd "$srcdir" =20 -DIE=3D0 - -for prog in autoreconf automake autoconf libtoolize -do - ($prog --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have $prog installed to compile libvirt-glib." - DIE=3D1 - } -done - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "I am going to run ./configure with no args - if you " - echo "wish to pass any extra arguments to it, please specify them = on " - echo "the $0 command line." -fi +(test -f libvirt-glib/libvirt-glib-main.c) || { + echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" + echo " top-level libvirt-glib directory" + exit 1 +} =20 # Real ChangeLog/AUTHORS is auto-generated from GIT logs at # make dist time, but automake requires that it # exists at all times :-( touch ChangeLog AUTHORS =20 -mkdir -p build-aux -autoreconf -if - -cd $THEDIR +aclocal --install || exit 1 +gtkdocize --copy || exit 1 +autoreconf --verbose --force --install || exit 1 =20 if test "x$1" =3D "x--system"; then shift @@ -51,7 +34,16 @@ if test "x$1" =3D "x--system"; then EXTRA_ARGS=3D"--prefix=3D$prefix --sysconfdir=3D$sysconfdir --localsta= tedir=3D$localstatedir --libdir=3D$libdir" fi =20 -$srcdir/configure $EXTRA_ARGS "$@" && { - echo - echo "Now type 'make' to compile libvirt-glib." -} +cd "$olddir" + +if [ "$NOCONFIGURE" =3D "" ]; then + $srcdir/configure $EXTRA_ARGS "$@" || exit 1 + + if [ "$1" =3D "--help" ]; then + exit 0 + else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list