[gucharmap] build: Make introspection and vapigen mandatory

[Christian Persch <chpe src gnome org>]

commit 6b6ec47d1822a59385fb9d6fd1c702d983f02858
Author: Christian Persch <chpe gnome org>
Date:   Sun Apr 29 19:18:14 2012 +0200

    build: Make introspection and vapigen mandatory

 configure.ac          |   28 ++++++++++++----------------
 gucharmap/Makefile.am |   26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7c5500e..f83840c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ AM_PROG_CC_C_O
 GNOME_COMMON_INIT
 GNOME_DEBUG_CHECK
 
-GLIB_REQUIRED=2.16.3
-GIO_REQUIRED=2.25.5
+GLIB_REQUIRED=2.32.0
+GIO_REQUIRED=2.32.0
 
 # check for win32
 case "$host" in
@@ -89,7 +89,7 @@ AC_MSG_RESULT([$with_gtk])
 
 case "$with_gtk" in
   3.0) GTK_API_VERSION=3.0
-       GTK_REQUIRED=3.0.0
+       GTK_REQUIRED=3.4.0
        GUCHARMAP_API_VERSION=2.90
        GUCHARMAP_API_MAJOR_VERSION=2
        GUCHARMAP_API_MINOR_VERSION=90
@@ -217,20 +217,10 @@ CC_CHECK_CFLAGS_APPEND([ \
 # Bindings
 # ********
 
-# No automagic please!
-if test -z "$enable_introspection"; then
-  enable_introspection=yes
-fi
-
-GOBJECT_INTROSPECTION_CHECK([0.9.0])
+GOBJECT_INTROSPECTION_REQUIRE([1.0.0])
 
-# No automagic please!
-if test -z "$enable_vala"; then
-  enable_vala=no
-fi
-m4_ifdef([VAPIGEN_CHECK],
-  [VAPIGEN_CHECK([0.16],[0.18])],
-  [AM_CONDITIONAL([ENABLE_VAPIGEN],[false])])
+enable_vala=no
+VAPIGEN_CHECK([0.16],[0.18])
 
 case "$with_gtk" in
   3.0) GUCHARMAP_GIR_VERSION=$GUCHARMAP_API_VERSION
@@ -243,6 +233,12 @@ AC_SUBST([GUCHARMAP_GIR_VERSION_U],[AS_TR_SH([$GUCHARMAP_GIR_VERSION])])
 AC_SUBST([GUCHARMAP_VAPI_VERSION])
 AC_SUBST([GUCHARMAP_VAPI_VERSION_U],[AS_TR_SH([$GUCHARMAP_VAPI_VERSION])])
 
+# ****
+# Vala
+# ****
+
+AM_PROG_VALAC
+
 # ***************
 # API & User Docs
 # ***************
diff --git a/gucharmap/Makefile.am b/gucharmap/Makefile.am
index 8698fb7..82c102f 100644
--- a/gucharmap/Makefile.am
+++ b/gucharmap/Makefile.am
@@ -216,9 +216,6 @@ CLEANFILES = \
 
 # introspection
 
-if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
 
@@ -231,15 +228,14 @@ Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_LIBS = libgucharmap GUCHARMAP_LIBRARY_SU
 Gucharmap_ GUCHARMAP_GIR_VERSION_U@_gir_FILES = $(filter-out unicode-%.h,$(libgucharmap GUCHARMAP_LIBRARY_SUFFIX_U@_la_SOURCES))
 
 girdir = $(datadir)/gir-1.0
-nodist_gir_DATA = $(INTROSPECTION_GIRS)
+nodist_gir_DATA = Gucharmap-$(GUCHARMAP_GIR_VERSION).gir
 
 typelibdir = $(libdir)/girepository-1.0
-nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+nodist_typelib_DATA = $(nodist_gir_DATA:.gir=.typelib)
 
-CLEANFILES += $(nodist_gir_DATA) $(nodist_typelib_DATA)
+CLEANFILES += $(INTROSPECTION_GIRS) $(INTROSPECTION_GIRS:.gir=.typelib)
 
-if ENABLE_VAPIGEN
-include $(VAPIGEN_MAKEFILE)
+# Vala
 
 VAPIGEN_VAPIS = Gucharmap-$(GUCHARMAP_VAPI_VERSION).vapi
 
@@ -256,13 +252,11 @@ Gucharmap_ GUCHARMAP_VAPI_VERSION_U@_vapi_FILES = Gucharmap-$(GUCHARMAP_GIR_VERS
 
 #vapidir = $(datadir)/vala/vapi
 vapidir = $(VAPIGEN_VAPIDIR)
-nodist_vapi_DATA = $(VAPIGEN_VAPIS)
-
-CLEANFILES += $(nodist_vapi_DATA)
+nodist_vapi_DATA = Gucharmap-$(GUCHARMAP_VAPI_VERSION).vapi
 
-endif # ENABLE_VAPIGEN
+CLEANFILES += $(VAPIGEN_VAPIS)
 
-endif # HAVE_INTROSPECTION
+# Legacy Charmap
 
 if ENABLE_CHARMAP
 
@@ -287,6 +281,8 @@ endif # !OS_WIN32
 
 endif # ENABLE_CHARMAP
 
+# GSettings schemas
+
 gsettings_ENUM_NAMESPACE = org.gnome.Charmap
 gsettings_ENUM_FILES = gucharmap-settings.h
 gsettings_SCHEMAS = org.gnome.Charmap.gschema.xml
@@ -295,4 +291,8 @@ EXTRA_DIST += $(gsettings_SCHEMAS)
 
 @GSETTINGS_RULES@
 
+# Includes
+
+include $(INTROSPECTION_MAKEFILE)
+include $(VAPIGEN_MAKEFILE)
 -include $(top_srcdir)/git.mk