guestfs-tools/0003-build-Remove-dependency-on-gobject-introspection.patch

   1 From 6bfe41474937bbaabd7c953ac62dc9a28aa6fa30 Mon Sep 17 00:00:00 2001
   2 From: "Richard W.M. Jones" <rjones@redhat.com>
   3 Date: Tue, 23 Mar 2021 13:38:56 +0000
   4 Subject: [PATCH 3/7] build: Remove dependency on gobject-introspection.
   5
   6 Only required for libguestfs GObject bindings, not for these tools.
   7
   8 Fixes: commit 4354a3126152a2748cc9097cba139b3908ccc342
   9 ---
  10  Makefile.am         |  1 -
  11  m4/introspection.m4 | 94 ---------------------------------------------
  12  2 files changed, 95 deletions(-)
  13  delete mode 100644 m4/introspection.m4
  14
  15 diff --git a/Makefile.am b/Makefile.am
  16 index 382f2db130..b5c1bc0b87 100644
  17 --- a/Makefile.am
  18 +++ b/Makefile.am
  19 @@ -75,7 +75,6 @@ EXTRA_DIST = \
  20         common/README \
  21         lib/guestfs-internal-all.h \
  22         m4/.gitignore \
  23 -       m4/introspection.m4 \
  24         podcheck.pl \
  25         test-functions.sh \
  26         tmp/.gitignore \
  27 diff --git a/m4/introspection.m4 b/m4/introspection.m4
  28 deleted file mode 100644
  29 index 586d679eea..0000000000
  30 --- a/m4/introspection.m4
  31 +++ /dev/null
  32 @@ -1,94 +0,0 @@
  33 -dnl -*- mode: autoconf -*-
  34 -dnl Copyright 2009 Johan Dahlin
  35 -dnl
  36 -dnl This file is free software; the author(s) gives unlimited
  37 -dnl permission to copy and/or distribute it, with or without
  38 -dnl modifications, as long as this notice is preserved.
  39 -dnl
  40 -
  41 -# serial 1
  42 -
  43 -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
  44 -[
  45 -    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
  46 -    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
  47 -    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
  48 -
  49 -    dnl enable/disable introspection
  50 -    m4_if([$2], [require],
  51 -    [dnl
  52 -        enable_introspection=yes
  53 -    ],[dnl
  54 -        AC_ARG_ENABLE(introspection,
  55 -                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
  56 -                                 [enable introspection for this build]),,
  57 -                                 [enable_introspection=auto])
  58 -    ])dnl
  59 -
  60 -    AC_MSG_CHECKING([for gobject-introspection])
  61 -
  62 -    dnl presence/version checking
  63 -    AS_CASE([$enable_introspection],
  64 -    [no], [dnl
  65 -        found_introspection="no (disabled, use --enable-introspection to enable)"
  66 -    ],dnl
  67 -    [yes],[dnl
  68 -        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
  69 -                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
  70 -        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
  71 -                         found_introspection=yes,
  72 -                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
  73 -    ],dnl
  74 -    [auto],[dnl
  75 -        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
  76 -    ],dnl
  77 -    [dnl
  78 -        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
  79 -    ])dnl
  80 -
  81 -    AC_MSG_RESULT([$found_introspection])
  82 -
  83 -    INTROSPECTION_SCANNER=
  84 -    INTROSPECTION_COMPILER=
  85 -    INTROSPECTION_GENERATE=
  86 -    INTROSPECTION_GIRDIR=
  87 -    INTROSPECTION_TYPELIBDIR=
  88 -    if test "x$found_introspection" = "xyes"; then
  89 -       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
  90 -       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
  91 -       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
  92 -       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
  93 -       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
  94 -       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
  95 -       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
  96 -       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
  97 -    fi
  98 -    AC_SUBST(INTROSPECTION_SCANNER)
  99 -    AC_SUBST(INTROSPECTION_COMPILER)
 100 -    AC_SUBST(INTROSPECTION_GENERATE)
 101 -    AC_SUBST(INTROSPECTION_GIRDIR)
 102 -    AC_SUBST(INTROSPECTION_TYPELIBDIR)
 103 -    AC_SUBST(INTROSPECTION_CFLAGS)
 104 -    AC_SUBST(INTROSPECTION_LIBS)
 105 -    AC_SUBST(INTROSPECTION_MAKEFILE)
 106 -
 107 -    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
 108 -])
 109 -
 110 -
 111 -dnl Usage:
 112 -dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
 113 -
 114 -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
 115 -[
 116 -  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
 117 -])
 118 -
 119 -dnl Usage:
 120 -dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
 121 -
 122 -
 123 -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
 124 -[
 125 -  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
 126 -])
 127 --
 128 2.29.0.rc2
 129