Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From 520c4d451efc488573746f169d8e47d5a131afc2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alex Kiernan <alex.kiernan@gmail.com> |
| 3 | Date: Fri, 20 May 2022 09:35:08 +0100 |
| 4 | Subject: [PATCH] build: Remove dead g-i-r configuration |
| 5 | |
| 6 | g-i-r support was removed in 2015 as part of removal of Gobject libudev |
| 7 | support, but the autoconf support wasn't removed but is dead. |
| 8 | |
| 9 | Fixes: 252150e181c5 ("src/gudev: remove Gobject libudev support.") |
| 10 | Upstream-Status: Submitted [https://github.com/eudev-project/eudev/pull/231] |
| 11 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> |
| 12 | Signed-off-by: Alex Kiernan <alex.kiernan@zuma.ai> |
| 13 | --- |
| 14 | configure.ac | 12 ------ |
| 15 | m4/introspection.m4 | 96 --------------------------------------------- |
| 16 | 2 files changed, 108 deletions(-) |
| 17 | delete mode 100644 m4/introspection.m4 |
| 18 | |
| 19 | diff --git a/configure.ac b/configure.ac |
| 20 | index 85a524a618ae..987d5037ae77 100644 |
| 21 | --- a/configure.ac |
| 22 | +++ b/configure.ac |
| 23 | @@ -183,17 +183,8 @@ AC_SUBST([udevrulesdir],[${udevlibexecdir}/rules.d]) |
| 24 | AC_SUBST([pkgconfiglibdir], [${libdir}/pkgconfig]) |
| 25 | AC_SUBST([sharepkgconfigdir],[${datadir}/pkgconfig]) |
| 26 | |
| 27 | -# introspection paths |
| 28 | -AC_SUBST([girdir], [${datadir}/gir-1.0]) |
| 29 | -AC_SUBST([typelibsdir], [${libdir}/girepository-1.0]) |
| 30 | - |
| 31 | AC_SUBST([rootrundir],[${with_rootrundir}]) |
| 32 | |
| 33 | -# ------------------------------------------------------------------------------ |
| 34 | - |
| 35 | -GOBJECT_INTROSPECTION_CHECK([1.31.1]) |
| 36 | -AM_CONDITIONAL([HAVE_INTROSPECTION], [test "$enable_introspection" = "yes"]) |
| 37 | - |
| 38 | # ------------------------------------------------------------------------------ |
| 39 | AC_ARG_ENABLE([programs], |
| 40 | AS_HELP_STRING([--disable-programs], [disable programs (udevd, udevadm and helpers)]), |
| 41 | @@ -349,9 +340,6 @@ AC_MSG_RESULT([ |
| 42 | |
| 43 | pkgconfiglibdir: ${libdir}/pkgconfig |
| 44 | sharepkgconfigdir ${datadir}/pkgconfig |
| 45 | - |
| 46 | - girdir ${datadir}/gir-1.0 |
| 47 | - typelibsdir ${libdir}/girepository-1.0 |
| 48 | ]) |
| 49 | |
| 50 | # ------------------------------------------------------------------------------ |
| 51 | diff --git a/m4/introspection.m4 b/m4/introspection.m4 |
| 52 | deleted file mode 100644 |
| 53 | index d89c3d907d9c..000000000000 |
| 54 | --- a/m4/introspection.m4 |
| 55 | +++ /dev/null |
| 56 | @@ -1,96 +0,0 @@ |
| 57 | -dnl -*- mode: autoconf -*- |
| 58 | -dnl Copyright 2009 Johan Dahlin |
| 59 | -dnl |
| 60 | -dnl This file is free software; the author(s) gives unlimited |
| 61 | -dnl permission to copy and/or distribute it, with or without |
| 62 | -dnl modifications, as long as this notice is preserved. |
| 63 | -dnl |
| 64 | - |
| 65 | -# serial 1 |
| 66 | - |
| 67 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
| 68 | -[ |
| 69 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 70 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 71 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
| 72 | - |
| 73 | - dnl enable/disable introspection |
| 74 | - m4_if([$2], [require], |
| 75 | - [dnl |
| 76 | - enable_introspection=yes |
| 77 | - ],[dnl |
| 78 | - AC_ARG_ENABLE(introspection, |
| 79 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
| 80 | - [Enable introspection for this build]),, |
| 81 | - [enable_introspection=auto]) |
| 82 | - ])dnl |
| 83 | - |
| 84 | - AC_MSG_CHECKING([for gobject-introspection]) |
| 85 | - |
| 86 | - dnl presence/version checking |
| 87 | - AS_CASE([$enable_introspection], |
| 88 | - [no], [dnl |
| 89 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
| 90 | - ],dnl |
| 91 | - [yes],[dnl |
| 92 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
| 93 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
| 94 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
| 95 | - found_introspection=yes, |
| 96 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
| 97 | - ],dnl |
| 98 | - [auto],[dnl |
| 99 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
| 100 | - dnl Canonicalize enable_introspection |
| 101 | - enable_introspection=$found_introspection |
| 102 | - ],dnl |
| 103 | - [dnl |
| 104 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
| 105 | - ])dnl |
| 106 | - |
| 107 | - AC_MSG_RESULT([$found_introspection]) |
| 108 | - |
| 109 | - INTROSPECTION_SCANNER= |
| 110 | - INTROSPECTION_COMPILER= |
| 111 | - INTROSPECTION_GENERATE= |
| 112 | - INTROSPECTION_GIRDIR= |
| 113 | - INTROSPECTION_TYPELIBDIR= |
| 114 | - if test "x$found_introspection" = "xyes"; then |
| 115 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 116 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 117 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 118 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
| 119 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
| 120 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
| 121 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
| 122 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 123 | - fi |
| 124 | - AC_SUBST(INTROSPECTION_SCANNER) |
| 125 | - AC_SUBST(INTROSPECTION_COMPILER) |
| 126 | - AC_SUBST(INTROSPECTION_GENERATE) |
| 127 | - AC_SUBST(INTROSPECTION_GIRDIR) |
| 128 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
| 129 | - AC_SUBST(INTROSPECTION_CFLAGS) |
| 130 | - AC_SUBST(INTROSPECTION_LIBS) |
| 131 | - AC_SUBST(INTROSPECTION_MAKEFILE) |
| 132 | - |
| 133 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
| 134 | -]) |
| 135 | - |
| 136 | - |
| 137 | -dnl Usage: |
| 138 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
| 139 | - |
| 140 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
| 141 | -[ |
| 142 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
| 143 | -]) |
| 144 | - |
| 145 | -dnl Usage: |
| 146 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
| 147 | - |
| 148 | - |
| 149 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
| 150 | -[ |
| 151 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
| 152 | -]) |
| 153 | -- |
| 154 | 2.35.1 |
| 155 | |