[libpeas/proxys: 19/22] Simplify gobject-introspection-related bits in configure.ac
- From: Steve Frécinaux <sfre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas/proxys: 19/22] Simplify gobject-introspection-related bits in configure.ac
- Date: Fri, 21 May 2010 19:14:03 +0000 (UTC)
commit 08158b9c90f1aedd24adce5af6d89cb8064488be
Author: Steve Frécinaux <code istique net>
Date: Thu May 20 17:09:31 2010 +0200
Simplify gobject-introspection-related bits in configure.ac
We don't support anymore to be built without gobject-introspection as
it is required even for C plugins, so just let's drop these
conditionals.
configure.ac | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a52045f..33f0af1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ PKG_CHECK_MODULES(PEAS, [
glib-2.0 >= 2.18.0
gobject-2.0 >= 2.23.6
gmodule-2.0 >= 2.18.0
- gobject-introspection-1.0 >= 0.6
+ gobject-introspection-1.0 >= 0.6.7
])
PKG_CHECK_MODULES(PEASUI, [
@@ -109,7 +109,7 @@ dnl ================================================================
dnl GObject Introspection
dnl ================================================================
-GOBJECT_INTROSPECTION_CHECK([0.6.7])
+GOBJECT_INTROSPECTION_REQUIRE([0.6.7])
dnl ================================================================
dnl Seed Javascript Engine
@@ -126,24 +126,15 @@ AC_MSG_CHECKING([for Seed JS availability.])
if test "x$enable_seed" = "xno"; then
found_seed="no (disabled, use --enable-seed to enable)"
-elif test "x$found_introspection" != "xyes"; then
- found_seed="no (disabled, enable introspection first)"
-elif test "x$enable_seed" = "xyes"; then
- if test "$found_introspection" != "yes"; then
- AC_MSG_ERROR([GObject introspection support must be enabled for Seed support])
- fi
-
- PKG_CHECK_EXISTS([seed],,
- AC_MSG_ERROR([seed is not installed]))
- PKG_CHECK_EXISTS([seed >= $SEED_REQUIRED],
- [found_seed=yes],
- AC_MSG_ERROR([You need to have seed >= $1 installed to build libpeas]))
else
PKG_CHECK_EXISTS([seed >= $SEED_REQUIRED],
[found_seed=yes],
[found_seed=no])
fi
+if test "$enable_seed" = "yes" -a "$found_seed" = "no"; then
+ AC_MSG_ERROR([You need to have seed >= $SEED_REQUIRED installed to build libpeas])
+fi
AC_MSG_RESULT([$found_seed])
if test "$found_seed" = "yes"; then
@@ -294,7 +285,6 @@ Configuration:
Source code location : ${srcdir}
Compiler : ${CC}
Installation prefix : ${prefix}
- GObject Introspection support : ${found_introspection}
Seed JS support : ${found_seed}
Python support : ${enable_python}
"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]