From 05f7c359ae59cbcf9890dddf27dd4362269459c8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Thu, 23 Feb 2012 00:20:15 +0100
Subject: make gudev dep optional

Debian has arches w/o udev (hurd-*, kfreebsd-*). These cannot build
indicator-session currently because libgudev-1.0-dev is missing there.
Make the gudev dep optional and thus make indicator-session buildable on
non-Linux arches again.
---
 src/Makefile.am | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 67a1cb6..04801b5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,8 +107,6 @@ indicator_session_service_SOURCES = \
 	user-menu-mgr.c \
 	device-menu-mgr.h \
 	device-menu-mgr.c \
-	udev-mgr.h \
-	udev-mgr.c \
 	sane-rules.h
 
 if BUILD_APT
@@ -117,6 +115,12 @@ indicator_session_service_SOURCES += \
 	apt-watcher.c 
 endif
 
+if HAS_GUDEV
+indicator_session_service_SOURCES += \
+	udev-mgr.h \
+	udev-mgr.c
+endif
+
 indicator_session_service_CFLAGS = \
 	$(SESSIONSERVICE_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -127,6 +131,13 @@ indicator_session_service_LDADD = \
 	$(SESSIONSERVICE_LIBS) \
 	$(GCONF_LIBS)
 
+if HAS_GUDEV
+indicator_session_service_CFLAGS += \
+	$(GUDEV_CFLAGS)
+indicator_session_service_LDADD += \
+	$(GUDEV_LIBS)
+endif
+
 #################
 # GTK Logout Stuff
 #################
-- 
cgit v1.2.3


From cc124ba5add6debff0f4053f43e3f2e160b2039c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Feb 2012 08:38:00 -0600
Subject: Making sure to distribute the files even if we don't use them to
 build.

---
 src/Makefile.am | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 04801b5..4da3fc5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,6 @@
 
+EXTRA_DIST =
+
 libexec_PROGRAMS = \
 	indicator-session-service
 
@@ -113,12 +115,20 @@ if BUILD_APT
 indicator_session_service_SOURCES += \
 	apt-watcher.h \
 	apt-watcher.c 
+else
+EXTRA_DIST += \
+	apt-watcher.h \
+	apt-watcher.c 
 endif
 
 if HAS_GUDEV
 indicator_session_service_SOURCES += \
 	udev-mgr.h \
 	udev-mgr.c
+else
+EXTRA_DIST += \
+	udev-mgr.h \
+	udev-mgr.c
 endif
 
 indicator_session_service_CFLAGS = \
@@ -179,7 +189,7 @@ BUILT_SOURCES = \
 	accounts-service-client.h \
 	accounts-service-user-client.h
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	org.freedesktop.ConsoleKit.Manager.xml \
 	org.freedesktop.ConsoleKit.Seat.xml \
 	org.freedesktop.ConsoleKit.Session.xml \
-- 
cgit v1.2.3


From 76e3d09219f1dd4f7dcb1e99dcaec562ff7cdcaf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 23 Feb 2012 08:39:11 -0600
Subject: Move the variables into the list straight up as they'll be NULL if
 undefined

---
 src/Makefile.am | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 4da3fc5..a1e443e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,17 +136,12 @@ indicator_session_service_CFLAGS = \
 	$(GCONF_CFLAGS) \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
 	-Wall -Werror \
-	-DG_LOG_DOMAIN=\"Indicator-Session\"
+	-DG_LOG_DOMAIN=\"Indicator-Session\" \
+	$(GUDEV_CFLAGS)
 indicator_session_service_LDADD = \
 	$(SESSIONSERVICE_LIBS) \
-	$(GCONF_LIBS)
-
-if HAS_GUDEV
-indicator_session_service_CFLAGS += \
-	$(GUDEV_CFLAGS)
-indicator_session_service_LDADD += \
+	$(GCONF_LIBS) \
 	$(GUDEV_LIBS)
-endif
 
 #################
 # GTK Logout Stuff
-- 
cgit v1.2.3