← Back to branch summary

~ci-train-bot/lightdm/lightdm-ubuntu-zesty-1679

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Robert Ancell
  • Date: 2016-05-19 02:01:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2312.
  • Revision ID: robert.ancell@canonical.com-20160519020157-1ihm9jmknpgc66k2
Refactor GreeterSession and Greeter into separate modules. This is to allow in-session greeters in the future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
158
158
dnl Configurable values
159
159
dnl ###########################################################################
160
160
 
161
 
USER_SESSION=default
 
161
DEFAULT_USER_SESSION=default
162
162
AC_ARG_WITH(user-session,
163
163
            AS_HELP_STRING(--with-user-session=<name>,
164
164
                           Session to use for user accounts),
165
165
    if test x$withval != x; then
166
 
        USER_SESSION="$withval"
 
166
        DEFAULT_USER_SESSION="$withval"
167
167
    fi
168
168
)
169
 
AC_SUBST(USER_SESSION)
170
 
AC_DEFINE_UNQUOTED(USER_SESSION, "$USER_SESSION", User session)
 
169
AC_SUBST(DEFAULT_USER_SESSION)
 
170
AC_DEFINE_UNQUOTED(DEFAULT_USER_SESSION, "$DEFAULT_USER_SESSION", User session)
171
171
 
172
 
GREETER_SESSION=default
 
172
DEFAULT_GREETER_SESSION=default
173
173
AC_ARG_WITH(greeter-session,
174
174
            AS_HELP_STRING(--with-greeter-session=<session>,
175
175
                           Greeter session),
176
176
    if test x$withval != x; then
177
 
        GREETER_SESSION="$withval"
 
177
        DEFAULT_GREETER_SESSION="$withval"
178
178
    fi
179
179
)
180
 
AC_SUBST(GREETER_SESSION)
181
 
AC_DEFINE_UNQUOTED(GREETER_SESSION, "$GREETER_SESSION", Greeter session)
 
180
AC_SUBST(DEFAULT_GREETER_SESSION)
 
181
AC_DEFINE_UNQUOTED(DEFAULT_GREETER_SESSION, "$DEFAULT_GREETER_SESSION", Greeter session)
182
182
 
183
183
GREETER_USER=lightdm
184
184
AC_ARG_WITH(greeter-user,
237
237
                    ===========================
238
238
 
239
239
        prefix:                   $prefix
240
 
        Greeter session:          $GREETER_SESSION
 
240
        Greeter session:          $DEFAULT_GREETER_SESSION
241
241
        Greeter user:             $GREETER_USER
242
 
        User session:             $USER_SESSION
 
242
        User session:             $DEFAULT_USER_SESSION
243
243
        GObject introspection:    $found_introspection
244
244
        Vala bindings:            $enable_vala
245
245
        liblightdm-qt:            $compile_liblightdm_qt4