diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-12-22 12:19:58 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-12-22 12:19:58 +0000 |
| commit | 96d8819b18b9fae4450b6cc42f1d529812ab64e9 (patch) | |
| tree | 2c234eb620bdd5050386e75285adf7cb4774a86b /lxde-base/lxdm/files | |
| parent | Fix src_install with USE contrib by Rafał Mużyło <galtgendo@o2.pl>, bug #4... (diff) | |
| download | historical-96d8819b18b9fae4450b6cc42f1d529812ab64e9.tar.gz historical-96d8819b18b9fae4450b6cc42f1d529812ab64e9.tar.bz2 historical-96d8819b18b9fae4450b6cc42f1d529812ab64e9.zip | |
Add (and fix) upstream patch for optional consolekit support. Thanks to Bombino <teknocratdefunct@riseup.net>. Bug #443666
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!
Diffstat (limited to 'lxde-base/lxdm/files')
| -rw-r--r-- | lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch new file mode 100644 index 000000000000..f21f4fd96057 --- /dev/null +++ b/lxde-base/lxdm/files/lxdm-0.4.1-optional-consolekit.patch @@ -0,0 +1,46 @@ +X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=443666 +X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=blobdiff_plain;f=configure.ac;h=9e21a22d893b45f1564e23b12c00a0bf546d95e8;hp=3c540df5cc76aa8c3ef394bae4f0d0cf33bff993;hb=371b018474217bdff1d5108b384fbf0f45aa873d;hpb=f625fd7b1f90caac260422a6c13e0cb12ccf1f96 + +Further Changes: Mmove the AC_CHECK_LIB([ck-connector]) inside the 'if' block +to avoid checking and enabling ck-connector even if --disable-consolekit was +passed. + +Signed-off-by: Markos Chandras <hwoarang@gentoo.org> + +Index: lxdm-0.4.1/configure.ac +=================================================================== +--- lxdm-0.4.1.orig/configure.ac ++++ lxdm-0.4.1/configure.ac +@@ -28,8 +28,6 @@ if test "x$USE_PAM" != "xno" ; then + fi]) + fi + +-AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) +- + # Checks for header files. + AC_PATH_X + AC_CHECK_HEADERS([shadow.h stdlib.h string.h unistd.h utmpx.h]) +@@ -89,11 +87,22 @@ PKG_CHECK_MODULES(GTK, [$pkg_modules]) + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ ++ ++AC_ARG_ENABLE(consolekit, ++ AC_HELP_STRING([--disable-consolekit],[disable ConsoleKit support]), ++ [enable_consolekit=$enableval], ++ [enable_consolekit=yes] ++) ++ ++if test "x$enable_consolekit" = "xyes" ; then ++ AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) ++ PKG_CHECK_MODULES(CONSOLEKIT, "ck-connector",[ + AC_SUBST(CONSOLEKIT_CFLAGS) + AC_SUBST(CONSOLEKIT_LIBS)],[ + echo "ConsoleKit devel package not found" + ]) ++fi ++ + + AC_ARG_ENABLE(password, + AC_HELP_STRING([--enable-password],[enable to load autologin password store at config file]), |