diff options
| author | Jens Georg <mail@jensge.org> | 2013-04-15 13:08:54 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2013-04-15 13:08:54 +0200 |
| commit | 4870e0488a3f79ca48b0f6b2c558b3aa13425d24 (patch) | |
| tree | 1027f5cc7c64ee845699a8b6312f325f6800d77d | |
| parent | fcb4ff74c05b021e6341fa93416eb0f02edb82ad (diff) | |
| download | gupnp-4870e0488a3f79ca48b0f6b2c558b3aa13425d24.tar.gz | |
Depend on vapigen >= 0.20 if g-i >= 1.36 is found
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | m4/vapigen.m4 | 6 |
2 files changed, 26 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dd807b9..76980cd 100644 --- a/configure.ac +++ b/configure.ac @@ -137,11 +137,22 @@ fi GOBJECT_INTROSPECTION_CHECK([0.6.4]) # vapigen +have_vapigen=no AS_IF([test "x$found_introspection" = "xyes"], [ - VALA_PROG_VAPIGEN([0.14]) + dnl output of g-i >= 1.36.0 needs vapigen >= 0.20 to process + AC_MSG_CHECKING([whether G-I is 1.36 or newer]) + VAPIGEN_MIN_VERSION=0.14 + AS_IF([pkg-config --atleast-version=1.36.0 gobject-introspection-1.0], + [ + AC_MSG_RESULT([yes]) + VAPIGEN_MIN_VERSION=0.20 + ],[AC_MSG_RESULT([no])] + ) + GUPNP_PROG_VAPIGEN([$VAPIGEN_MIN_VERSION]) ] ) +AS_IF([test "x$VAPIGEN" != "x"], [have_vapigen=yes]) AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"]) # Gtk-doc @@ -161,3 +172,13 @@ gupnp-1.0.pc gupnp-1.0-uninstalled.pc ]) AC_OUTPUT + +echo " + ${PACKAGE} ${VERSION} + --------------------- + + Prefix: ${prefix} + GObject-Introspection: ${found_introspection} + VALA bindings: ${have_vapigen} + Context manager: ${with_context_manager} +" diff --git a/m4/vapigen.m4 b/m4/vapigen.m4 index df6395d..c909726 100644 --- a/m4/vapigen.m4 +++ b/m4/vapigen.m4 @@ -26,7 +26,7 @@ dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org> # # VALA_PROG_VAPIGEN([MINIMUM-VERSION]) # ------------------------------------ -AC_DEFUN([VALA_PROG_VAPIGEN], +AC_DEFUN([GUPNP_PROG_VAPIGEN], [AC_PATH_PROG([VAPIGEN], [vapigen], []) AS_IF([test -z "$VAPIGEN"], [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], @@ -37,5 +37,7 @@ AC_DEFUN([VALA_PROG_VAPIGEN], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) - AC_MSG_WARN([Vala API Generator $1 not found.])])])]) + AC_MSG_WARN([Vala API Generator $1 not found.]) + VAPIGEN="" + ])])]) ]) |