| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 22 Feb 2016 16:34:03 +0200 |
| 4 | Subject: [PATCH] configure.in: drop introspection macros, replace them with a |
| 5 | standard one |
| 6 | |
| 7 | Upstream-Status: Pending |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 9 | --- |
| 10 | configure.in | 57 +-------------------------------------------------------- |
| 11 | 1 file changed, 1 insertion(+), 56 deletions(-) |
| 12 | |
| 13 | diff --git a/configure.in b/configure.in |
| 14 | index 8e1aa37..3086503 100644 |
| 15 | --- a/configure.in |
| 16 | +++ b/configure.in |
| 17 | @@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS) |
| 18 | AC_SUBST(MONO_LIBS) |
| 19 | ]) |
| 20 | |
| 21 | -# GObject Introspection |
| 22 | -GIR_REQ=1.0.0 |
| 23 | -AC_ARG_ENABLE(introspection, |
| 24 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], |
| 25 | - [Enable introspection for this build]),, |
| 26 | - [enable_introspection=no]) |
| 27 | - |
| 28 | -AC_MSG_CHECKING([for gobject-introspection]) |
| 29 | - |
| 30 | -dnl presence/version checking |
| 31 | -AS_CASE([$enable_introspection], |
| 32 | -[no], [ |
| 33 | - found_introspection="no (disabled, use --enable-introspection to enable)" |
| 34 | -], |
| 35 | -[yes],[ |
| 36 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, |
| 37 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) |
| 38 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], |
| 39 | - found_introspection=yes, |
| 40 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) |
| 41 | -], |
| 42 | -[auto],[ |
| 43 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) |
| 44 | -dnl Canonicalize enable_introspection |
| 45 | -enable_introspection=$found_introspection |
| 46 | -], |
| 47 | -[ |
| 48 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) |
| 49 | -]) |
| 50 | +GOBJECT_INTROSPECTION_CHECK([1.46.0]) |
| 51 | |
| 52 | -AC_MSG_RESULT([$found_introspection]) |
| 53 | - |
| 54 | -INTROSPECTION_SCANNER= |
| 55 | -INTROSPECTION_COMPILER= |
| 56 | -INTROSPECTION_GENERATE= |
| 57 | -INTROSPECTION_GIRDIR= |
| 58 | -INTROSPECTION_TYPELIBDIR= |
| 59 | -if test "x$found_introspection" = "xyes"; then |
| 60 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` |
| 61 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` |
| 62 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` |
| 63 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` |
| 64 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" |
| 65 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` |
| 66 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` |
| 67 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection |
| 68 | -fi |
| 69 | -AC_SUBST(INTROSPECTION_SCANNER) |
| 70 | -AC_SUBST(INTROSPECTION_COMPILER) |
| 71 | -AC_SUBST(INTROSPECTION_GENERATE) |
| 72 | -AC_SUBST(INTROSPECTION_GIRDIR) |
| 73 | -AC_SUBST(INTROSPECTION_TYPELIBDIR) |
| 74 | -AC_SUBST(INTROSPECTION_CFLAGS) |
| 75 | -AC_SUBST(INTROSPECTION_LIBS) |
| 76 | -AC_SUBST(INTROSPECTION_MAKEFILE) |
| 77 | - |
| 78 | -AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") |
| 79 | dnl we need to change the install directories for distcheck |
| 80 | AC_ARG_WITH([gir-dir], |
| 81 | AS_HELP_STRING( |
| 82 | -- |
| 83 | 2.7.0 |
| 84 | |