diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-27 13:09:30 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-27 13:19:08 +0200 |
| commit | 2b742fce82eb1326faaee3b2cc4ff993e701ef53 (patch) | |
| tree | 44e4d274b22274029d43cd18126810551125a394 /configure.ac | |
| parent | 7609126be290e01dd452a3fc1bdf8d57af363569 (diff) | |
| parent | 93d9fe647be1f2effc0bfeeec903b5e030182f6c (diff) | |
| download | vala-2b742fce82eb1326faaee3b2cc4ff993e701ef53.tar.gz | |
Merge valadoc 0.36.0
Consider valadoc a part of vala's toolchain and therefore let it live in
the main repository.
With this merge there is no need to maintain multiple driver sources since
only one is required from now on.
There is no dependency on gee-0.8 and vala's internal gee copy has made to
be sufficient.
The libvaladoc library will be suffixed with vala's version suffix too.
Besides this renaming the rest of the valadoc file layout is kept the same.
https://bugzilla.gnome.org/show_bug.cgi?id=782782
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 531eef482..c73d5d6b1 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip]) +AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip subdir-objects]) AM_MAINTAINER_MODE([enable]) API_VERSION=0.38 @@ -86,6 +86,7 @@ AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_LIBS) GLIB_REQUIRED=2.40.0 +LIBGVC_REQUIRED=2.16 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED) @@ -97,6 +98,36 @@ PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED) AC_SUBST(GMODULE_CFLAGS) AC_SUBST(GMODULE_LIBS) +PKG_CHECK_MODULES(LIBGVC, libgvc >= $LIBGVC_REQUIRED) +AC_MSG_CHECKING([for CGRAPH]) +cgraph_tmp_LIBADD="$LIBADD" +cgraph_tmp_CFLAGS="$CFLAGS" +LIBADD="$LIBADD $LIBGVC_LIBS" +CFLAGS="$CFLAGS $LIBGVC_CFLAGS" +AC_RUN_IFELSE( + [AC_LANG_SOURCE([ + #include <gvc.h> + + int main(void) { + #ifdef WITH_CGRAPH + return 0; + #else + return -1; + #endif + } + ])], [ + AC_MSG_RESULT([yes]) + VALAFLAGS="$VALAFLAGS -D WITH_CGRAPH" + have_cgraph=yes + ], [ + AC_MSG_RESULT([no]) + have_cgraph=no + ] +) +LIBADD="$cgraph_tmp_LIBADD" +CFLAGS="$cgraph_tmp_CFLAGS" +AM_CONDITIONAL(HAVE_CGRAPH, test "$have_cgraph" = "yes") + AC_PATH_PROG([XSLTPROC], [xsltproc], :) AM_CONDITIONAL(HAVE_XSLTPROC, test "$XSLTPROC" != :) @@ -124,6 +155,17 @@ AC_CONFIG_FILES([Makefile vapigen/vapigen.pc vapigen/Makefile vapigen/vala-gen-introspect/Makefile - vapigen/vala-gen-introspect/vala-gen-introspect]) + vapigen/vala-gen-introspect/vala-gen-introspect + libvaladoc/valadoc.pc + libvaladoc/valadoc.deps + libvaladoc/Makefile + valadoc/Makefile + valadoc/doclets/Makefile + valadoc/doclets/html/Makefile + valadoc/doclets/devhelp/Makefile + valadoc/doclets/gtkdoc/Makefile + valadoc/icons/Makefile + valadoc/tests/Makefile +]) AC_OUTPUT |