| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 867a512eddbeb1899d3e7096df3da1dd0ce3e7b7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Fri, 23 Oct 2015 14:06:17 +0300 |
| 4 | Subject: [PATCH] Drop introspection macros from acinclude.m4 |
| 5 | |
| 6 | They take precendence over our customized macros, and so |
| 7 | introspection doesn't work correctly. |
| 8 | |
| 9 | Upstream-Status: Pending [review on oe-core list] |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | --- |
| 12 | acinclude.m4 | 96 ------------------------------------------------------------ |
| 13 | 1 file changed, 96 deletions(-) |
| 14 | |
| 15 | diff --git a/acinclude.m4 b/acinclude.m4 |
| 16 | index 8899c7c..48fd5d8 100644 |
| 17 | --- a/acinclude.m4 |
| 18 | +++ b/acinclude.m4 |
| 19 | @@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], |
| 20 | ]) |
| 21 | |
| 22 | |
| 23 | -dnl REMOVE THIS WHEN introspection.m4 is widely available |
| 24 | -dnl |
| 25 | -dnl -*- mode: autoconf -*- |
| 26 | -dnl Copyright 2009 Johan Dahlin |
| 27 | -dnl |
| 28 | -dnl This file is free software; the author(s) gives unlimited |
| 29 | -dnl permission to copy and/or distribute it, with or without |
| 30 | -dnl modifications, as long as this notice is preserved. |
| 31 | -dnl |
| 32 | - |
| 33 | -# serial 1 |
| 34 | - |
| 35 | -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], |
| 36 | -[ |
| 37 | - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 38 | - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first |
| 39 | - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first |
| 40 | - |
| 41 | - dnl enable/disable introspection |
| 42 | - m4_if([$2], [require], |
| 43 | - [dnl |
| 44 | - enable_introspection=yes |
| 45 | - ],[dnl |
| 46 | - AC_ARG_ENABLE(introspection, |
| 47 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
| 48 | - [Enable introspection for this build]),, |
| 49 | - [enable_introspection=auto]) |
| 50 | - ])dnl |
| 51 | - |
| 52 | - AC_MSG_CHECKING([for gobject-introspection]) |
| 53 | - |
| 54 | - dnl presence/version checking |
| 55 | - AS_CASE([$enable_introspection], |
| 56 | - [no], [dnl |
| 57 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
| 58 | - ],dnl |
| 59 | - [yes],[dnl |
| 60 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
| 61 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
| 62 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], |
| 63 | - found_introspection=yes, |
| 64 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
| 65 | - ],dnl |
| 66 | - [auto],[dnl |
| 67 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) |
| 68 | - ],dnl |
| 69 | - [dnl |
| 70 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
| 71 | - ])dnl |
| 72 | - |
| 73 | - AC_MSG_RESULT([$found_introspection]) |
| 74 | - |
| 75 | - INTROSPECTION_SCANNER= |
| 76 | - INTROSPECTION_COMPILER= |
| 77 | - INTROSPECTION_GENERATE= |
| 78 | - INTROSPECTION_GIRDIR= |
| 79 | - INTROSPECTION_TYPELIBDIR= |
| 80 | - if test "x$found_introspection" = "xyes"; then |
| 81 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 82 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 83 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 84 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
| 85 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
| 86 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
| 87 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
| 88 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 89 | - fi |
| 90 | - AC_SUBST(INTROSPECTION_SCANNER) |
| 91 | - AC_SUBST(INTROSPECTION_COMPILER) |
| 92 | - AC_SUBST(INTROSPECTION_GENERATE) |
| 93 | - AC_SUBST(INTROSPECTION_GIRDIR) |
| 94 | - AC_SUBST(INTROSPECTION_TYPELIBDIR) |
| 95 | - AC_SUBST(INTROSPECTION_CFLAGS) |
| 96 | - AC_SUBST(INTROSPECTION_LIBS) |
| 97 | - AC_SUBST(INTROSPECTION_MAKEFILE) |
| 98 | - |
| 99 | - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
| 100 | -]) |
| 101 | - |
| 102 | - |
| 103 | -dnl Usage: |
| 104 | -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) |
| 105 | - |
| 106 | -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], |
| 107 | -[ |
| 108 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) |
| 109 | -]) |
| 110 | - |
| 111 | -dnl Usage: |
| 112 | -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) |
| 113 | - |
| 114 | - |
| 115 | -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], |
| 116 | -[ |
| 117 | - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) |
| 118 | -]) |
| 119 | -- |
| 120 | 2.1.4 |
| 121 | |