diff options
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | src/librygel-core/Makefile.am | 5 | ||||
-rw-r--r-- | src/librygel-renderer/Makefile.am | 4 | ||||
-rw-r--r-- | src/librygel-server/Makefile.am | 5 |
4 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 36b14348..324dd564 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ LT_INIT([dlopen disable-static]) AC_SYS_LARGEFILE -GOBJECT_INTROSPECTION_REQUIRE([1.33.4]) +GOBJECT_INTROSPECTION_CHECK([1.33.4]) dnl Required versions of library packages dnl Not all of these are actually used, depending on the configure options. @@ -484,6 +484,8 @@ echo " preferences ui: ${HAVE_GTK} Media Engine: ${with_media_engine} API documentation: ${found_valadoc} + GObject-Introspection: ${found_introspection} + Plugins: examples: ${enable_example_plugins} tracker: ${enable_tracker_plugin} diff --git a/src/librygel-core/Makefile.am b/src/librygel-core/Makefile.am index 8d113e28..715be188 100644 --- a/src/librygel-core/Makefile.am +++ b/src/librygel-core/Makefile.am @@ -53,6 +53,7 @@ rygel-core-2.4.vapi rygel-core.h Rygel-2.4.gir: librygel_core_2_4_la_vala.stamp INTROSPECTION_GIRS= INTROSPECTION_SCANNER_ARGS= INTROSPECTION_COMPILER_ARGS= -l librygel-core-2.4.so.2 +if HAVE_INTROSPECTION $(builddir)/RygelCore-2.4.gir: $(srcdir)/Rygel-2.4.gir $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelCore.,g' -e 's,namespace name="Rygel",namespace name="RygelCore",g' $< >$@ GIRS = RygelCore-2.4.gir @@ -63,10 +64,12 @@ dist_gir_DATA = $(GIRS) typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(GIRS:.gir=.typelib) -DISTCLEANFILES = RygelCore-2.4.typelib +endif MAINTAINERCLEANFILES += $(BUILT_SOURCES) +DISTCLEANFILES = $(nodist_typelib_DATA) + EXTRA_DIST = \ rygel-build-config.vapi \ $(VAPI_FILES) \ diff --git a/src/librygel-renderer/Makefile.am b/src/librygel-renderer/Makefile.am index 7150667d..158e83bf 100644 --- a/src/librygel-renderer/Makefile.am +++ b/src/librygel-renderer/Makefile.am @@ -37,6 +37,7 @@ rygel-renderer.h rygel-renderer-2.4.vapi Rygel-2.4.gir: librygel_renderer_2_4_la INTROSPECTION_GIRS= INTROSPECTION_SCANNER_ARGS= INTROSPECTION_COMPILER_ARGS= -l librygel-renderer-2.4.so.2 --includedir=$(builddir)/../librygel-core --includedir=$(srcdir)/../librygel-core +if HAVE_INTROSPECTION $(builddir)/RygelRenderer-2.4.gir: $(srcdir)/Rygel-2.4.gir $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelRenderer.,g' \ -e 's,namespace name="Rygel",namespace name="RygelRenderer",g' \ @@ -52,6 +53,7 @@ dist_gir_DATA = $(GIRS) typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(GIRS:.gir=.typelib) +endif -DISTCLEANFILES = RygelRenderer-2.4.typelib +DISTCLEANFILES = $(nodist_typelib_DATA) EXTRA_DIST = rygel-renderer.h rygel-renderer-2.4.vapi rygel-renderer-2.4.deps RygelRenderer-2.4.gir Rygel-2.4.gir diff --git a/src/librygel-server/Makefile.am b/src/librygel-server/Makefile.am index 75a0778b..663a399e 100644 --- a/src/librygel-server/Makefile.am +++ b/src/librygel-server/Makefile.am @@ -41,6 +41,7 @@ rygel-server.h rygel-server-2.4.vapi Rygel-2.4.gir: librygel_server_2_4_la_vala. INTROSPECTION_GIRS= INTROSPECTION_SCANNER_ARGS= INTROSPECTION_COMPILER_ARGS= -l librygel-server-2.4.so.2 --includedir=$(builddir)/../librygel-core --includedir=$(srcdir)/../librygel-core +if HAVE_INTROSPECTION $(builddir)/RygelServer-2.4.gir: $(srcdir)/Rygel-2.4.gir $(AM_V_GEN)$(SED) -e 's,Rygel\.,RygelServer.,g' \ -e 's,namespace name="Rygel",namespace name="RygelServer",g' \ @@ -56,5 +57,7 @@ dist_gir_DATA = $(GIRS) typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(GIRS:.gir=.typelib) -DISTCLEANFILES = RygelServer-2.4.typelib +endif + +DISTCLEANFILES = $(nodist_typelib_DATA) EXTRA_DIST = rygel-server.h rygel-server-2.4.vapi rygel-server-2.4.deps RygelServer-2.4.gir Rygel-2.4.gir |