diff options
| author | Ray Strode <rstrode@redhat.com> | 2010-06-08 17:56:22 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2016-11-07 13:11:39 -0500 |
| commit | 6fb09da7f2d5334c5fe93f0e698034844ca0aab7 (patch) | |
| tree | eb3148ca5f6874f71248d0dec753fc762a39d33f | |
| parent | b4a271f9718d6c3f209b32e98a0a982c8a8c8a40 (diff) | |
| download | gnome-settings-daemon-6fb09da7f2d5334c5fe93f0e698034844ca0aab7.tar.gz | |
Fix build for --disable-smartcard-support
commit 4b334ddf6c53ce795063d44746a9a2d90fea85ff broke the
build for --disable-smartcard-users.
This commit fixes that. Based on a patch from
William Jon McCann <william.jon.mccann@gmail.com>
https://bugzilla.gnome.org/show_bug.cgi?id=617748
| -rw-r--r-- | plugins/Makefile.am | 15 | ||||
| -rw-r--r-- | plugins/smartcard/Makefile.am | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 027ae162..ef82aa0e 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,6 @@ NULL = -SUBDIRS = \ - common \ +enabled_plugins = \ a11y-keyboard \ background \ clipboard \ @@ -12,10 +11,20 @@ SUBDIRS = \ keyboard \ media-keys \ mouse \ - smartcard \ sound \ typing-break \ xrandr \ xrdb \ xsettings \ $(NULL) + +disabled_plugins = $(NULL) + +if SMARTCARD_SUPPORT +enabled_plugins += smartcard +else +disabled_plugins += smartcard +endif + +SUBDIRS = common $(enabled_plugins) +DIST_SUBDIRS = $(SUBDIRS) $(disabled_plugins) diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am index 62e253eb..dcfaf493 100644 --- a/plugins/smartcard/Makefile.am +++ b/plugins/smartcard/Makefile.am @@ -1,4 +1,3 @@ -if SMARTCARD_SUPPORT plugin_LTLIBRARIES = \ libsmartcard.la @@ -32,7 +31,6 @@ libsmartcard_la_LIBADD = \ $(NSS_LIBS) @GSD_INTLTOOL_PLUGIN_RULE@ -endif plugin_in_files = \ smartcard.gnome-settings-plugin.in |