diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-08-29 01:54:30 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-08-29 01:54:30 +0000 |
| commit | 9f74cfed8f808009b3acfa0af383218f3bf0fc00 (patch) | |
| tree | b2bf5d33d780221b8dfb6f39895ff7b4a35b613c | |
| parent | 52fb36b1ec52e78916bf9cf1a5e7bdce05482b0c (diff) | |
Define HAS_COOKIE_MAKER and search for mcookie so startx will generate
xauth tokens for the servers it starts.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -0,0 +1,6 @@ +2005-08-29 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + * Makefile.am: + Define HAS_COOKIE_MAKER and search for mcookie so startx will generate + xauth tokens for the servers it starts. diff --git a/Makefile.am b/Makefile.am index 152331d..6e9bd22 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,7 @@ xinitrc: xinitrc.cpp $(SED) s/XINITDIR/`echo $(XINITDIR) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/xinitrc.cpp | $(SED) s/XCOMM/\#/ > $@ startx: startx.cpp Makefile - $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $(srcdir)/startx.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ | $(SED) -e 's/@@/\\/' > $@ + $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) -DHAS_COOKIE_MAKER -DMK_COOKIE=$(MCOOKIE) $(srcdir)/startx.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ | $(SED) -e 's/@@/\\/' > $@ xinitrc_DATA = xinitrc diff --git a/configure.ac b/configure.ac index 5d51a91..f0b3297 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,9 @@ esac AC_SUBST(XINIT_CFLAGS) AC_SUBST(XINIT_LIBS) +AC_PATH_PROGS(MCOOKIE, [mcookie], [$(MCOOKIE)], + [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin]) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile]) |