[libgsf] Copied code from introspection.m4
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Copied code from introspection.m4
- Date: Mon, 21 May 2012 16:16:45 +0000 (UTC)
commit 6a4bb94deff6720f22ac447ad703fdc2f2d2092d
Author: Jean Brefort <jean brefort normalesup org>
Date: Mon May 21 18:16:23 2012 +0200
Copied code from introspection.m4
ChangeLog | 4 ++
configure.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 73 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e9e3c18..a2452ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-21 Jean Brefort <jean brefort normalesup org>
+
+ * configure.in: copied code from introspection.m4
+
2012-05-18 Jean Brefort <jean brefort normalesup org>
* Makefile.am: enhance introspection build support.
diff --git a/configure.in b/configure.in
index 87f7c6f..174d09d 100644
--- a/configure.in
+++ b/configure.in
@@ -61,11 +61,78 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+dnl Checks for libraries.
+ifelse([
+ If we defined the module lists on the M4 level, we could have problems
+ with PKG_CHECK_MODULES from pkgconfig 0.16.0, which double quotes its
+ second argument (the module list).
+ As a handy workaround, we use shell variables.
+])
+dnl Modules required for libgsf
+libgsf_reqs="
+ gobject-2.0 >= 2.16.0
+ glib-2.0 >= 2.26.0
+ libxml-2.0 >= 2.4.16
+"
-
+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@:>@])
+])
-GOBJECT_INTROSPECTION_CHECK(1.0)
+AC_MSG_RESULT([$found_introspection])
+
+INTROSPECTION_SCANNER=
+INTROSPECTION_COMPILER=
+INTROSPECTION_GENERATE=
+INTROSPECTION_GIRDIR=
+INTROSPECTION_TYPELIBDIR=
+if test "x$found_introspection" = "xyes"; then
+ 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`
+ 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")
dnl we need to change the install directories for distcheck
AC_ARG_WITH([gir-dir],
AS_HELP_STRING(
@@ -92,22 +159,6 @@ AC_ARG_WITH([typelib-dir],
)
AC_SUBST(TYPELIBDIR)
-dnl Checks for libraries.
-ifelse([
- If we defined the module lists on the M4 level, we could have problems
- with PKG_CHECK_MODULES from pkgconfig 0.16.0, which double quotes its
- second argument (the module list).
- As a handy workaround, we use shell variables.
-])
-dnl Modules required for libgsf
-libgsf_reqs="
- gobject-2.0 >= 2.16.0
- glib-2.0 >= 2.26.0
- libxml-2.0 >= 2.4.16
-"
-
-PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs)
-
## this should come after `AC_PROG_CC'
ifdef([GNOME_COMPILE_WARNINGS],[GNOME_COMPILE_WARNINGS],)
CFLAGS="$CFLAGS $WARN_CFLAGS -DG_DISABLE_DEPRECATED"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]