diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-13 11:08:47 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-13 11:08:47 +0100 |
| commit | 7445c3e6c1028c4ca1610d25d9736fbc7e9fead3 (patch) | |
| tree | 34f9691831e33e391474c5f3049d345b375a9296 | |
| parent | 16048800e01d2a18e7fb041d8fadad49731277a9 (diff) | |
fd.o #30134: don't allow Vala bindings if introspection is disabled
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index d536cb5b5..ab23ce650 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,9 +7,11 @@ SUBDIRS = \ telepathy-glib \ $(NULL) +if HAVE_INTROSPECTION if HAVE_VALA SUBDIRS += vala endif +endif SUBDIRS += \ extensions \ diff --git a/configure.ac b/configure.ac index 78ab93805..d73b746b7 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,10 @@ AC_ARG_ENABLE(vala-bindings, enable_vala_bindings=no ) if test x$enable_vala_bindings = xyes; then + if test "x$INTROSPECTION_SCANNER" = x; then + AC_MSG_ERROR([GObject-Introspection must be enabled for Vala bindings]) + fi + m4_ifdef([AM_PROG_VALAC], [AM_PROG_VALAC(0.9.3)], [AC_MSG_ERROR([Automake >= 1.11 required for Vala bindings])]) have_vala=yes |