diff options
| author | Matěj Cepl <mcepl@redhat.com> | 2009-07-17 20:59:48 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-07-17 21:18:06 -0700 |
| commit | 0c57a398cef50d13a821ad341ffb15ab0cbd2bad (patch) | |
| tree | ea58b371c7489b6c75dbc31a4058e72bde018c49 | |
| parent | 56a14b8a1f4d3aa883485b794c818581b8f07cd8 (diff) | |
Add variable DisplayManager.authDir to xdm-config (Fedora bug 388431)
Fedora patch xdm-1.1.6-authDir-var-bug388431.patch
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | config/Makefile.am | 1 | ||||
| -rw-r--r-- | config/xdm-config.cpp | 1 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 9 insertions, 1 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 0eb0e72..86eb0b3 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -51,6 +51,7 @@ MKTEMP_DEFINES = -DMKTEMP_COMMAND=$(MKTEMP_COMMAND) CPP_FILES_FLAGS = -DBINDIR="$(bindir)" -DDEFAULTVT="$(DEFAULTVT)" \ -DXDMDIR="$(XDMLIBDIR)" -DXDMLOGDIR="$(XDMLOGDIR)" \ + -DXDMXAUTHDIR="$(XDMXAUTHDIR)" \ -DXDMPIDDIR="$(XDMPIDDIR)" -DXDMCONFIGDIR="$(XDMCONFIGDIR)" \ -DXDMSCRIPTDIR="$(XDMSCRIPTDIR)" -DSU="$(SU)" \ -DCHOOSERPATH="$(XDMLIBDIR)/chooser" $(XPMDEFINES) \ diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp index 85a0765..59d548b 100644 --- a/config/xdm-config.cpp +++ b/config/xdm-config.cpp @@ -9,6 +9,7 @@ #ifndef XDMSCRIPTDIR #define XDMSCRIPTDIR XDMDIR #endif +DisplayManager.authDir: XDMXAUTHDIR DisplayManager.errorLogFile: XDMLOGDIR/xdm.log DisplayManager.pidFile: XDMPIDDIR/xdm.pid DisplayManager.keyFile: XDMCONFIGDIR/xdm-keys diff --git a/configure.ac b/configure.ac index 7b35ab9..19b3c26 100644 --- a/configure.ac +++ b/configure.ac @@ -517,7 +517,13 @@ AC_DEFINE_DIR(DEF_CHOOSER, XDMLIBDIR/chooser, # -DDEF_AUTH_DIR="$(XDMDIR)" -AC_DEFINE_DIR(DEF_AUTH_DIR, XDMCONFIGDIR, +AC_ARG_WITH(authdir, + AC_HELP_STRING([--with-authdir=<pathname>], + [specify directory for X auth files (default=/var/lib/xdm)]), + [XDMXAUTHDIR="$withval"], [XDMXAUTHDIR="/var/lib/xdm"]) +AC_SUBST(XDMXAUTHDIR) + +AC_DEFINE_DIR(DEF_AUTH_DIR, XDMXAUTHDIR, [Define to pathname where authentication cookie files should be stored]) # -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so" |