From 3fc6bda05d1abd043b70ee0944a1e8d838b7bf4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Sat, 27 Feb 2016 19:57:58 +0100 Subject: New 16.04 release --- configure.ac | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ff12a43..ace54d1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 12.10.2, ted@canonical.com) -AC_COPYRIGHT([Copyright 2009,2010 Canonical]) +AC_INIT(libdbusmenu, 16.04.0, ted@canonical.com) +AC_COPYRIGHT([Copyright 2009-2016 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 12.10.2, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 16.04.0, [-Wno-portability]) AM_MAINTAINER_MODE @@ -138,6 +138,16 @@ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10], AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"]) +if test "$enable_introspection" = "yes"; then + # Redefine introspection dirs using proper prefixes + + INTROSPECTION_GIRDIR=`$PKG_CONFIG --define-variable=datadir=${datadir} --variable=girdir gobject-introspection-1.0` + AC_SUBST(INTROSPECTION_GIRDIR) + + INTROSPECTION_TYPELIBDIR=`$PKG_CONFIG --define-variable=libdir=${libdir} --variable=typelibdir gobject-introspection-1.0` + AC_SUBST(INTROSPECTION_TYPELIBDIR) +fi + ########################### # Vala API Generation ########################### -- cgit v1.2.3