diff options
| author | Evgeni Golov <evgeni@debian.org> | 2012-02-23 00:20:15 +0100 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2012-02-23 00:20:15 +0100 |
| commit | 05f7c359ae59cbcf9890dddf27dd4362269459c8 (patch) | |
| tree | c722805bbfa2a3e405d5aaf538f87840b3112546 /src | |
| parent | 13d6c2bd152c5c9de79537f541f687e3dcd8ba7b (diff) | |
| download | ayatana-indicator-session-05f7c359ae59cbcf9890dddf27dd4362269459c8.tar.gz ayatana-indicator-session-05f7c359ae59cbcf9890dddf27dd4362269459c8.tar.bz2 ayatana-indicator-session-05f7c359ae59cbcf9890dddf27dd4362269459c8.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 15 | ||||
| -rw-r--r-- | src/device-menu-mgr.c | 2 |
2 files changed, 15 insertions, 2 deletions
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 ################# diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index f8f0696..8e0713e 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -733,8 +733,10 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode) restart_shutdown_logout_mi->shutdown_mi = shutdown_mi; update_menu_entries(restart_shutdown_logout_mi); +#ifdef HAS_GUDEV // Time to create the udev mgr and hand it the static relevant items. self->udev_mgr = udev_mgr_new (scanners_menuitem, webcam_menuitem); +#endif } static void |