diff options
author | Colin Watson <cjwatson@ubuntu.com> | 2014-02-09 16:09:57 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:21 +0000 |
commit | 7a26d16efb4ee303c8d66ee82caf9d0686f4a074 (patch) | |
tree | 131e8962617e1f41402ba2468ad331dd888c101a /configure | |
parent | ef912859a4300360164292abe47b5516c8ee4a13 (diff) |
Add support for registering ConsoleKit sessions on login
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450
Last-Updated: 2014-03-20
Patch-Name: consolekit.patch
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 132 |
1 files changed, 132 insertions, 0 deletions
@@ -740,6 +740,7 @@ with_privsep_user | |||
740 | with_sandbox | 740 | with_sandbox |
741 | with_selinux | 741 | with_selinux |
742 | with_kerberos5 | 742 | with_kerberos5 |
743 | with_consolekit | ||
743 | with_privsep_path | 744 | with_privsep_path |
744 | with_xauth | 745 | with_xauth |
745 | enable_strip | 746 | enable_strip |
@@ -1432,6 +1433,7 @@ Optional Packages: | |||
1432 | --with-sandbox=style Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, capsicum) | 1433 | --with-sandbox=style Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, capsicum) |
1433 | --with-selinux Enable SELinux support | 1434 | --with-selinux Enable SELinux support |
1434 | --with-kerberos5=PATH Enable Kerberos 5 support | 1435 | --with-kerberos5=PATH Enable Kerberos 5 support |
1436 | --with-consolekit Enable ConsoleKit support | ||
1435 | --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty) | 1437 | --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty) |
1436 | --with-xauth=PATH Specify path to xauth program | 1438 | --with-xauth=PATH Specify path to xauth program |
1437 | --with-maildir=/path/to/mail Specify your system mail directory | 1439 | --with-maildir=/path/to/mail Specify your system mail directory |
@@ -17217,6 +17219,135 @@ fi | |||
17217 | 17219 | ||
17218 | 17220 | ||
17219 | 17221 | ||
17222 | # Check whether user wants ConsoleKit support | ||
17223 | CONSOLEKIT_MSG="no" | ||
17224 | LIBCK_CONNECTOR="" | ||
17225 | |||
17226 | # Check whether --with-consolekit was given. | ||
17227 | if test "${with_consolekit+set}" = set; then : | ||
17228 | withval=$with_consolekit; if test "x$withval" != "xno" ; then | ||
17229 | if test -n "$ac_tool_prefix"; then | ||
17230 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
17231 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
17232 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
17233 | $as_echo_n "checking for $ac_word... " >&6; } | ||
17234 | if ${ac_cv_path_PKGCONFIG+:} false; then : | ||
17235 | $as_echo_n "(cached) " >&6 | ||
17236 | else | ||
17237 | case $PKGCONFIG in | ||
17238 | [\\/]* | ?:[\\/]*) | ||
17239 | ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. | ||
17240 | ;; | ||
17241 | *) | ||
17242 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
17243 | for as_dir in $PATH | ||
17244 | do | ||
17245 | IFS=$as_save_IFS | ||
17246 | test -z "$as_dir" && as_dir=. | ||
17247 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
17248 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
17249 | ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
17250 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
17251 | break 2 | ||
17252 | fi | ||
17253 | done | ||
17254 | done | ||
17255 | IFS=$as_save_IFS | ||
17256 | |||
17257 | ;; | ||
17258 | esac | ||
17259 | fi | ||
17260 | PKGCONFIG=$ac_cv_path_PKGCONFIG | ||
17261 | if test -n "$PKGCONFIG"; then | ||
17262 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 | ||
17263 | $as_echo "$PKGCONFIG" >&6; } | ||
17264 | else | ||
17265 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
17266 | $as_echo "no" >&6; } | ||
17267 | fi | ||
17268 | |||
17269 | |||
17270 | fi | ||
17271 | if test -z "$ac_cv_path_PKGCONFIG"; then | ||
17272 | ac_pt_PKGCONFIG=$PKGCONFIG | ||
17273 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
17274 | set dummy pkg-config; ac_word=$2 | ||
17275 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
17276 | $as_echo_n "checking for $ac_word... " >&6; } | ||
17277 | if ${ac_cv_path_ac_pt_PKGCONFIG+:} false; then : | ||
17278 | $as_echo_n "(cached) " >&6 | ||
17279 | else | ||
17280 | case $ac_pt_PKGCONFIG in | ||
17281 | [\\/]* | ?:[\\/]*) | ||
17282 | ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. | ||
17283 | ;; | ||
17284 | *) | ||
17285 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
17286 | for as_dir in $PATH | ||
17287 | do | ||
17288 | IFS=$as_save_IFS | ||
17289 | test -z "$as_dir" && as_dir=. | ||
17290 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
17291 | if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
17292 | ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
17293 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
17294 | break 2 | ||
17295 | fi | ||
17296 | done | ||
17297 | done | ||
17298 | IFS=$as_save_IFS | ||
17299 | |||
17300 | ;; | ||
17301 | esac | ||
17302 | fi | ||
17303 | ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG | ||
17304 | if test -n "$ac_pt_PKGCONFIG"; then | ||
17305 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 | ||
17306 | $as_echo "$ac_pt_PKGCONFIG" >&6; } | ||
17307 | else | ||
17308 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
17309 | $as_echo "no" >&6; } | ||
17310 | fi | ||
17311 | |||
17312 | if test "x$ac_pt_PKGCONFIG" = x; then | ||
17313 | PKGCONFIG="no" | ||
17314 | else | ||
17315 | case $cross_compiling:$ac_tool_warned in | ||
17316 | yes:) | ||
17317 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
17318 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
17319 | ac_tool_warned=yes ;; | ||
17320 | esac | ||
17321 | PKGCONFIG=$ac_pt_PKGCONFIG | ||
17322 | fi | ||
17323 | else | ||
17324 | PKGCONFIG="$ac_cv_path_PKGCONFIG" | ||
17325 | fi | ||
17326 | |||
17327 | if test "$PKGCONFIG" != "no"; then | ||
17328 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ck-connector" >&5 | ||
17329 | $as_echo_n "checking for ck-connector... " >&6; } | ||
17330 | if $PKGCONFIG --exists ck-connector; then | ||
17331 | CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector` | ||
17332 | CKCON_LIBS=`$PKGCONFIG --libs ck-connector` | ||
17333 | CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS" | ||
17334 | SSHDLIBS="$SSHDLIBS $CKCON_LIBS" | ||
17335 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
17336 | $as_echo "yes" >&6; } | ||
17337 | |||
17338 | $as_echo "#define USE_CONSOLEKIT 1" >>confdefs.h | ||
17339 | |||
17340 | CONSOLEKIT_MSG="yes" | ||
17341 | else | ||
17342 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
17343 | $as_echo "no" >&6; } | ||
17344 | fi | ||
17345 | fi | ||
17346 | fi | ||
17347 | |||
17348 | fi | ||
17349 | |||
17350 | |||
17220 | # Looking for programs, paths and files | 17351 | # Looking for programs, paths and files |
17221 | 17352 | ||
17222 | PRIVSEP_PATH=/var/empty | 17353 | PRIVSEP_PATH=/var/empty |
@@ -19746,6 +19877,7 @@ echo " MD5 password support: $MD5_MSG" | |||
19746 | echo " libedit support: $LIBEDIT_MSG" | 19877 | echo " libedit support: $LIBEDIT_MSG" |
19747 | echo " Solaris process contract support: $SPC_MSG" | 19878 | echo " Solaris process contract support: $SPC_MSG" |
19748 | echo " Solaris project support: $SP_MSG" | 19879 | echo " Solaris project support: $SP_MSG" |
19880 | echo " ConsoleKit support: $CONSOLEKIT_MSG" | ||
19749 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | 19881 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" |
19750 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | 19882 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" |
19751 | echo " BSD Auth support: $BSD_AUTH_MSG" | 19883 | echo " BSD Auth support: $BSD_AUTH_MSG" |