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