1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From 16d2c2e74350fda5505982fb150e72af7aee7454 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 19 Feb 2016 16:23:56 +0200
Subject: [PATCH] configure.ac: drop a copy-paste of introspection.m4 macros
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
configure.ac | 78 +-----------------------------------------------------------
1 file changed, 1 insertion(+), 77 deletions(-)
diff --git a/configure.ac b/configure.ac
index 54f7663..3038535 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,83 +77,7 @@ libgsf_reqs="
"
PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
-# GObject Introspection
-GIR_REQ=1.0.0
-AC_ARG_ENABLE(introspection,
- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
- [Enable introspection for this build]),,
- [enable_introspection=no])
-
-AC_MSG_CHECKING([for gobject-introspection])
-
-dnl presence/version checking
-AS_CASE([$enable_introspection],
-[no], [
- found_introspection="no (disabled, use --enable-introspection to enable)"
-],
-[yes],[
- PKG_CHECK_EXISTS([gobject-introspection-1.0],,
- AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
- found_introspection=yes,
- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-],
-[auto],[
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
-dnl Canonicalize enable_introspection
-enable_introspection=$found_introspection
-],
-[
- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-])
-
-AC_MSG_RESULT([$found_introspection])
-
-if test "x$found_introspection" = "xyes"; then
- dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR
- dnl if you wish. If you override the latter, you might want to set
- dnl GI_TYPELIB_PATH to include the same directory. For example
- dnl
- dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0
- dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH
- dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0
- dnl
- dnl Note, that unlike binaries produced with libgsf, nothing tells
- dnl python where to find libgsf, so you might also need to set
- dnl LD_LIBRARY_PATH.
-
- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
- if test "x$INTROSPECTION_GIRDIR" = x; then
- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
- fi
- if test "x$INTROSPECTION_TYPELIBDIR" = x; then
- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
- fi
- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-else
- INTROSPECTION_SCANNER=
- INTROSPECTION_COMPILER=
- INTROSPECTION_GENERATE=
- INTROSPECTION_GIRDIR=
- INTROSPECTION_TYPELIBDIR=
- INTROSPECTION_CFLAGS=
- INTROSPECTION_LIBS=
- INTROSPECTION_MAKEFILE=
-fi
-AC_SUBST(INTROSPECTION_SCANNER)
-AC_SUBST(INTROSPECTION_COMPILER)
-AC_SUBST(INTROSPECTION_GENERATE)
-AC_SUBST(INTROSPECTION_GIRDIR)
-AC_SUBST(INTROSPECTION_TYPELIBDIR)
-AC_SUBST(INTROSPECTION_CFLAGS)
-AC_SUBST(INTROSPECTION_LIBS)
-AC_SUBST(INTROSPECTION_MAKEFILE)
-
-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+GOBJECT_INTROSPECTION_CHECK([1.46.0])
dnl we need to change the install directories for distcheck
AC_ARG_WITH([gir-dir],
AS_HELP_STRING(
--
2.7.0
|
