From a36493af4afb4e46d307291c896faf6409c94019 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 14:20:47 -0500 Subject: Adding in new deps and a version bump --- configure.ac | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ec22ca2..84df5c8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-fusa.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-fusa, 0.1) +AM_INIT_AUTOMAKE(indicator-fusa, 0.1dev) AM_MAINTAINER_MODE @@ -22,9 +22,12 @@ AC_CONFIG_MACRO_DIR([m4]) ########################### GTK_REQUIRED_VERSION=2.12 -PANEL_REQUIRED_VERSION=2.0.0 +INDICATOR_REQUIRED_VERSION=0.2.0 +DBUSMENUGTK_REQUIRED_VERSION=0.0.0 -PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION + indicator >= $INDICATOR_REQUIRED_VERSION + dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION) AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -- cgit v1.2.3 From d68a776f7c88fc1304572e4739a65ee1b93688e4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 8 Jun 2009 14:45:38 -0500 Subject: Switching the pkgconfig based directory. --- configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 84df5c8..09aabfb 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,13 @@ PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) +########################### +# Indicator Info +########################### + +INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +AC_SUBST(INDICATORDIR) + ########################### # Files ########################### -- cgit v1.2.3 From 45361f6e3c6061d4630a630c8b2b48861e4cac57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Jun 2009 11:35:11 -0500 Subject: Adding in a bunch of service files. We're hip now. --- configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 09aabfb..512914e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(src/indicator-fusa.c) +AC_INIT(src/indicator-sus.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-fusa, 0.1dev) +AM_INIT_AUTOMAKE(indicator-sus, 0.1dev) AM_MAINTAINER_MODE @@ -45,6 +45,10 @@ AC_SUBST(INDICATORDIR) AC_OUTPUT([ Makefile src/Makefile +data/Makefile +data/indicator-status.service +data/indicator-users.service +data/indicator-session.service ]) ########################### @@ -53,7 +57,7 @@ src/Makefile AC_MSG_NOTICE([ -FUSA Indicator Configuration: +SUS Indicator Configuration: Prefix: $prefix ]) -- cgit v1.2.3 From 49c4646f0d2beb676e6d60d971fe7789253c4f38 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Jun 2009 15:35:25 -0500 Subject: Oh, stealing the methods used in PolicyKit for building these. I dislike calling sed directly, but the results are fantastic. --- configure.ac | 3 --- 1 file changed, 3 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 512914e..742403a 100644 --- a/configure.ac +++ b/configure.ac @@ -46,9 +46,6 @@ AC_OUTPUT([ Makefile src/Makefile data/Makefile -data/indicator-status.service -data/indicator-users.service -data/indicator-session.service ]) ########################### -- cgit v1.2.3 From ee013228b486d5b49be2737e90f3e75aded90365 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 9 Jun 2009 16:53:00 -0500 Subject: Adding more dependencies and cflags and stuff to make the builds of the services more complete --- configure.ac | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 742403a..1d86cac 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,23 @@ PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) +DBUSMENUGLIB_REQUIRED_VERSION=0.0.0 + +PKG_CHECK_MODULES(STATUSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION) + +AC_SUBST(STATUSERVICE_CFLAGS) +AC_SUBST(STATUSERVICE_LIBS) + +PKG_CHECK_MODULES(USERSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION) + +AC_SUBST(USERSERVICE_CFLAGS) +AC_SUBST(USERSERVICE_LIBS) + +PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION) + +AC_SUBST(SESSIONERVICE_CFLAGS) +AC_SUBST(SESSIONERVICE_LIBS) + ########################### # Indicator Info ########################### -- cgit v1.2.3 From 4a3887142581168e9eda220bd22c1b9f10073fd1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Jun 2009 09:48:51 -0500 Subject: Adding a configure flag so that indicators can be installed locally for distcheck purposes. --- configure.ac | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1d86cac..4d656c5 100644 --- a/configure.ac +++ b/configure.ac @@ -48,11 +48,22 @@ PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSIO AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) +########################### +# 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 ########################### -INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +if test "x$with_localinstall" = "xyes"; then + INDICATORDIR="${libdir}/indicators/2/" +else + INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator` +fi AC_SUBST(INDICATORDIR) ########################### -- cgit v1.2.3 From 0909c13dac683fe593e32fedbb682309aabd1a08 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 10 Jun 2009 09:52:00 -0500 Subject: Adding in the DBus services directory with localinstall support --- configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4d656c5..d299a0d 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,17 @@ else 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) + ########################### # Files ########################### -- cgit v1.2.3 From 96ca29c44edb5a8b92339d8be7b8b9189cc8863b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jul 2009 15:56:01 -0500 Subject: Building a little dialog. Now it's kinda linked into the build system. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d299a0d..58fee07 100644 --- a/configure.ac +++ b/configure.ac @@ -84,6 +84,7 @@ AC_SUBST(DBUSSERVICEDIR) AC_OUTPUT([ Makefile src/Makefile +src/gtk-dialog/Makefile data/Makefile ]) -- cgit v1.2.3 From 472065f301abb41d33573e83eb5bdd5ea018973b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jul 2009 16:06:05 -0500 Subject: Bringing in all the GTK includes and libraries --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 58fee07..9d64f40 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,11 @@ PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSIO AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) +PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION) + +AC_SUBST(GTKLOGOUTHELPER_CFLAGS) +AC_SUBST(GTKLOGOUTHELPER_LIBS) + ########################### # Check to see if we're local ########################### -- cgit v1.2.3 From 316a59dbcf5f5725ad1bb92d3165d0994ac51df3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 21 Jul 2009 16:20:31 -0500 Subject: Whoo, hoo, it builds --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9d64f40..1e65958 100644 --- a/configure.ac +++ b/configure.ac @@ -48,7 +48,8 @@ PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSIO AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) -PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION + polkit-gnome) AC_SUBST(GTKLOGOUTHELPER_CFLAGS) AC_SUBST(GTKLOGOUTHELPER_LIBS) -- cgit v1.2.3