diff options
author | Colin Walters <walters@verbum.org> | 2013-03-07 17:57:55 -0500 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2013-03-07 18:15:36 -0500 |
commit | acc931c762b5510103a7f49cf3074c1228700cb8 (patch) | |
tree | c317c39d9659cfd7f9174d7177499fcea9578299 /data/Makefile.am | |
parent | e4653154419423f5c08bd4f16ef9b9c3b2dda54e (diff) | |
download | gdm-acc931c762b5510103a7f49cf3074c1228700cb8.tar.gz |
Add --disable-fallback-greeter configure option
See https://bugzilla.gnome.org/show_bug.cgi?id=672943
This pairs with the above commit; it allows operating system
builders to entirely disable the fallback greeter, and rely
on software GL.
At the moment we keep this a configure option since some consumers of
GDM are using the fallback greeter.
https://bugzilla.gnome.org/show_bug.cgi?id=695414
Diffstat (limited to 'data/Makefile.am')
-rw-r--r-- | data/Makefile.am | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index f85b578f..3d7bf3ba 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -80,10 +80,18 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in -e 's,[@]sbindir[@],$(sbindir),g' \ <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in -gdm-shell.session: $(srcdir)/gdm-shell.session.in +if ENABLE_FALLBACK_GREETER +FALLBACK_SESSION_IN = $(srcdir)/gdm-shell-with-fallback.session.in +else +FALLBACK_SESSION_IN = $(srcdir)/gdm-shell.session.in +endif + +EXTRA_DIST += gdm-shell.session.in gdm-shell-with-fallback.session.in + +gdm-shell.session: $(FALLBACK_SESSION_IN) sed -e 's,[@]libexecdir[@],$(libexecdir),g' \ -e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \ - < $(srcdir)/gdm-shell.session.in > gdm-shell.session + < $< > $@.tmp && mv $@.tmp $@ localealiasdir = $(datadir)/gdm localealias_DATA = locale.alias @@ -153,7 +161,6 @@ EXTRA_DIST += \ PreSession.in \ PostSession.in \ PostLogin \ - gdm-shell.session.in \ dconf-profile \ 00-upstream-settings \ 00-upstream-settings-locks \ |