50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
From 29d4536122174a3495e49727200da3e4315527de Mon Sep 17 00:00:00 2001
|
|
From: Emmanuele Bassi <ebassi@linux.intel.com>
|
|
Date: Wed, 11 Aug 2010 12:50:31 +0000
|
|
Subject: build: Re-sync the introspection.m4 file
|
|
|
|
---
|
|
diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4
|
|
index bb3a0da..589721c 100644
|
|
--- a/build/autotools/introspection.m4
|
|
+++ b/build/autotools/introspection.m4
|
|
@@ -21,7 +21,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
|
],[dnl
|
|
AC_ARG_ENABLE(introspection,
|
|
AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
|
|
- [Enable introspection for this build]),,
|
|
+ [Enable introspection for this build]),,
|
|
[enable_introspection=auto])
|
|
])dnl
|
|
|
|
@@ -42,7 +42,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
|
[auto],[dnl
|
|
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
|
|
],dnl
|
|
- [dnl
|
|
+ [dnl
|
|
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
|
|
])dnl
|
|
|
|
@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
|
|
INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
|
|
INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
|
|
INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
|
|
+ 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
|
|
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")
|
|
])
|
|
--
|
|
cgit v0.8.3.1-30-gff3a
|