diff options
| author | Vadim Barkov <[email protected]> | 2016-12-19 23:24:10 +0300 |
|---|---|---|
| committer | Vadim Barkov <[email protected]> | 2016-12-19 23:24:10 +0300 |
| commit | 98c44e3c9455581f90c4f6a70fc42adf986d8206 (patch) | |
| tree | e9de2a70895a7f28d47eb12b12f9e3d33c64faa3 /configure.ac | |
| parent | 2314b3828cbe540d65ba517c32872476417501a6 (diff) | |
| parent | 38c20e460232c5f4ec7bf616180ff777b5d6b3a0 (diff) | |
| download | pluma-98c44e3c9455581f90c4f6a70fc42adf986d8206.tar.bz2 pluma-98c44e3c9455581f90c4f6a70fc42adf986d8206.tar.xz | |
Merge branch 'master' of https://github.com/mate-desktop/pluma
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 4fd1c5f4..d2b83381 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_PREREQ(2.63.2) m4_define(pluma_major_version, 1) m4_define(pluma_minor_version, 17) -m4_define(pluma_micro_version, 0) +m4_define(pluma_micro_version, 2) m4_define(pluma_version, pluma_major_version.pluma_minor_version.pluma_micro_version) AC_INIT([pluma], [pluma_version], @@ -39,7 +39,6 @@ LT_INIT(disable-static) GTK_DOC_CHECK([1.0],[--flavour=no-tmpl]) -AC_CHECK_FUNC(sigaction) AC_CHECK_LIB(m, floor) dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work @@ -161,6 +160,8 @@ PKG_CHECK_MODULES(PLUMA, [ gio-2.0 >= 2.26.0 gtk+-3.0 >= $GTK_REQUIRED gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED + libpeas-1.0 >= 1.2.0 + libpeas-gtk-1.0 >= 1.2.0 ]) PKG_CHECK_MODULES(X11, [x11]) @@ -176,6 +177,16 @@ PKG_CHECK_MODULES(EGG_SMCLIENT, [sm >= 1.0.0]) AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) +# Introspection +GOBJECT_INTROSPECTION_CHECK([0.9.3]) + +if test "$found_introspection" = "yes"; then + have_introspection=yes + AC_DEFINE([HAVE_INTROSPECTION], [1], [Define to enable GObject Introspection]) +else + have_introspection=no +fi + dnl ================================================================ dnl GSettings related settings dnl ================================================================ @@ -213,10 +224,8 @@ AC_ARG_ENABLE([tests], AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes) PLUGIN_LIBTOOL_FLAGS="-module -avoid-version" -LOADER_LIBTOOL_FLAGS="-module -avoid-version" AC_SUBST(PLUGIN_LIBTOOL_FLAGS) -AC_SUBST(LOADER_LIBTOOL_FLAGS) PLUMA_PLUGINS_DATA_DIR="$datadir/pluma/plugins" AC_SUBST(PLUMA_PLUGINS_DATA_DIR) @@ -240,8 +249,6 @@ pluma/smclient/Makefile pluma/Makefile help/Makefile pixmaps/Makefile -plugin-loaders/Makefile -plugin-loaders/c/Makefile plugins/Makefile plugins/changecase/Makefile plugins/docinfo/Makefile @@ -269,6 +276,7 @@ Configuration: Compiler: ${CC} Spell Plugin enabled: $enable_enchant Gvfs metadata enabled: $enable_gvfs_metadata + GObject Introspection: ${have_introspection} Tests enabled: $enable_tests " |