From ef6b3b8daaef62a502c60e0faa22c3a4b10c0399 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 13 Nov 2012 13:32:15 +0100 Subject: Move service .xml into a common directory Both the service (in src/) and the client library (in libmessaging-menu/) need access to the dbus interface description file. Until now, it resided in src, with both Makefiles calling gdbus-codegen on it. This patch moves the file to common/ and builds a convenience library that contains only the generated code. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8aa2e8a..b5af4d1 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile src/Makefile +common/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile -- cgit v1.2.3 From 5b0ea10ca057ffe594c17e8f96b08c5293baa570 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 11 Jul 2013 16:13:37 -0400 Subject: generate vapi --- configure.ac | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b020d30..b699b4f 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,22 @@ else fi AC_SUBST(DBUSSERVICEDIR) +########################### +# Vala API Generation +########################### + +AC_ARG_ENABLE([vala], + AC_HELP_STRING([--disable-vala], [Disable vala]), + [enable_vala=$enableval], [enable_vala=yes]) + +AS_IF([test "x$enable_vala" != "xno"],[ + AM_COND_IF([HAVE_INTROSPECTION],,[ + AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection]) + ]) +AC_PATH_PROG([VALA_API_GEN], [vapigen]) +]) +AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) + ############################## # Custom Junk ############################## @@ -197,5 +213,6 @@ Messaging Indicator Configuration: gtest: $enable_tests gcov: $use_gcov introspecion: $enable_introspection + Vala bindings: $enable_vala documentation: $enable_gtk_doc ]) -- cgit v1.2.3 From 7caf6bb6440fd777f50e88456c62697c3cf15aa1 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 25 Jul 2013 18:53:14 +0200 Subject: Add a indicator file --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b699b4f..0e89c84 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,12 @@ GTK_DOC_CHECK([1.18], [--flavour no-tmpl]) GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_REQUIRED_VERSION]) +AC_ARG_WITH([indicator-dir], + [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])], + [], + [with_indicator_dir=$datadir/unity/indicators]) +AC_SUBST([INDICATOR_DIR], [$with_indicator_dir]) + ########################### # gcov coverage reporting ########################### -- cgit v1.2.3 From 02e8c5411aaf4b5696a66835559f7759ecc97407 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Tue, 30 Jul 2013 14:56:51 +0200 Subject: Remove --enable-localinstall configure flag --- configure.ac | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0e89c84..1b1a1af 100644 --- a/configure.ac +++ b/configure.ac @@ -99,35 +99,6 @@ if test "x$enable_tests" != "xno"; then fi AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) -########################### -# Check to see if we're local -########################### - -with_localinstall="no" -AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) - -########################### -# Indicator Info -########################### - -if test "x$with_localinstall" = "xyes"; then - INDICATORDIR="${libdir}/indicators/2/" -else - INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4` -fi -AC_SUBST(INDICATORDIR) - -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - ########################### # Vala API Generation ########################### @@ -215,7 +186,6 @@ AC_MSG_NOTICE([ Messaging Indicator Configuration: Prefix: $prefix - Indicator Dir: $INDICATORDIR gtest: $enable_tests gcov: $use_gcov introspecion: $enable_introspection -- cgit v1.2.3