Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gir: enforce gir dependency on gtkdoc header generation #3

Open
wants to merge 1 commit into
base: generate-gi
Choose a base branch
from
Open

gir: enforce gir dependency on gtkdoc header generation #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,23 +127,11 @@ AC_SUBST([pkgdatadir])
# Documentation tools
GEANY_CHECK_DOCUTILS
GEANY_CHECK_DOXYGEN
GEANY_CHECK_GTKDOC_HEADER
GEANY_CHECK_INTROSPECTION

# libgeany
GEANY_LIB_INIT

# *optional* GObject-Introspection support
m4_ifdef([GOBJECT_INTROSPECTION_CHECK],dnl
[GOBJECT_INTROSPECTION_CHECK([1.30.0])],dnl
[AC_ARG_ENABLE([introspection],
[AS_HELP_STRING([--enable-introspection=no],
[Enable introspection for this build (not available)])])
AS_IF([test "x$enable_introspection" = xyes],
[AC_MSG_ERROR([GObject-Introspection support not built in])],
[AC_MSG_NOTICE([GObject-Introspection support not built in])])
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])])
GEANY_STATUS_ADD([Enable GObject-Introspection], [$enable_introspection])

# Output
AC_CONFIG_FILES([
Makefile
Expand Down
38 changes: 38 additions & 0 deletions m4/geany-introspection.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
dnl GEANY_CHECK_INTROSPECTION
dnl checks for GtkDoc header generation requirements and define
dnl ENABLE_GTKDOC_HEADER Automake conditional as appropriate
AC_DEFUN([GEANY_CHECK_INTROSPECTION],
[
AC_REQUIRE([GEANY_CHECK_GTKDOC_HEADER])
gir_ver=1.30.0

AC_ARG_ENABLE(introspection,
AS_HELP_STRING([--enable-introspection],
[Generate GObject-Introspection data [default=auto]]),
[arg_enable_introspection=$enableval],
[arg_enable_introspection=auto])

dnl Don't use GOBJECT_INTROSPECTION_CHECK because it's impossible to detect
dnl if yes or auto was passed to --enable-introspection. Therefore we have our
dnl own AC_ARG_ENABLE and use GOBJECT_INTROSPECTION_REQUIRE where appropriate.
m4_ifdef([GOBJECT_INTROSPECTION_REQUIRE],dnl
[AS_IF([test $arg_enable_introspection = yes],
[GOBJECT_INTROSPECTION_REQUIRE([$gir_ver])],
[test $arg_enable_introspection != no],
[PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $gir_ver],
[GOBJECT_INTROSPECTION_REQUIRE([$gir_ver])])])],
[AS_IF([test $arg_enable_introspection = xyes],
[AC_MSG_ERROR([GObject-Introspection support not built in])],
[AC_MSG_NOTICE([GObject-Introspection support not built in])
enable_introspection=no])])

dnl Warn (and disable) our bail out depending on gtkdoc header availability
AS_IF([test "$arg_enable_introspection$geany_enable_gtkdoc_header" = "yesno"],
[AC_MSG_ERROR([GObject-Introspection support requires --enable-gtkdoc-header])],
[test "$enable_introspection$geany_enable_gtkdoc_header" = "yesno"],
[AC_MSG_NOTICE([GObject-Introspection support requires --enable-gtkdoc-header])
enable_introspection=no])

AM_CONDITIONAL(HAVE_INTROSPECTION, [test "$enable_introspection" = "yes"])
GEANY_STATUS_ADD([Generate GObject-Introspection data], [$enable_introspection])
])