diff options
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | sysui/CustomTarget_share.mk | 4 |
2 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 96f776280732..11474b80a891 100644 --- a/configure.ac +++ b/configure.ac @@ -1228,6 +1228,11 @@ libo_FUZZ_ARG_ENABLE(gtk3, [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]), ,test "${enable_gtk3+set}" = set || enable_gtk3=yes) +AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection], + [Generate files for GObject introspection. Requires --enable-gtk3. (Typically used by + Linux distributions.)])) + AC_ARG_ENABLE(split-app-modules, AS_HELP_STRING([--enable-split-app-modules], [Split file lists for app modules, e.g. base, calc. @@ -10431,7 +10436,6 @@ if test "x$enable_gtk3" = "xyes"; then if test "x$ENABLE_GTK3" = "xTRUE"; then AC_DEFINE(ENABLE_GTK3) R="gtk3" - GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION) else AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found]) fi @@ -10450,6 +10454,14 @@ AC_SUBST(GTK3_LIBS) AC_SUBST(GTK3_CFLAGS) AC_SUBST(ENABLE_GTK3) +if test "$enable_introspection" = yes; then + if test "$ENABLE_GTK3" = TRUE; then + GOBJECT_INTROSPECTION_REQUIRE(INTROSPECTION_REQUIRED_VERSION) + else + AC_MSG_ERROR([--enable-introspection requires --enable-gtk3]) + fi +fi + ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then if test "$with_system_cairo" = no; then diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 9afe6da42a45..231aa4ff930d 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -127,9 +127,9 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ $(product)/openoffice.keys \ $(product)/openoffice.sh \ $(product)/create_tree.sh \ - $(if $(filter deb rpm,$(PKGFORMAT)),$(if $(INTROSPECTION_SCANNER),\ + $(if $(INTROSPECTION_SCANNER),\ $(product)/LOKDocView-0.1.gir \ - $(product)/LOKDocView-0.1.typelib)) \ + $(product)/LOKDocView-0.1.typelib) \ $(product)/launcherlist) \ )) |