diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2005-10-10 Alan Coopersmith <alan.coopersmith@sun.com> + + * configure.ac: + * Makefile.am: + Don't define HAS_COOKIE_MAKER if mcookie wasn't found. + 2005-08-29 Daniel Stone <daniel@freedesktop.org> Version 0.99.1. diff --git a/Makefile.am b/Makefile.am index 6e9bd22..46e1a5f 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) -DHAS_COOKIE_MAKER -DMK_COOKIE=$(MCOOKIE) $(srcdir)/startx.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ | $(SED) -e 's/@@/\\/' > $@ + $(RAWCPP) -DXINITDIR=$(XINITDIR) -DBINDIR=$(bindir) $(STARTX_COOKIE_FLAGS) $(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 bef3670..5b17f71 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,12 @@ esac AC_SUBST(XINIT_CFLAGS) AC_SUBST(XINIT_LIBS) -AC_PATH_PROGS(MCOOKIE, [mcookie], [$(MCOOKIE)], +AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin]) +if test x$MCOOKIE != x ; then + STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE=$(MCOOKIE)' +fi +AC_SUBST(STARTX_COOKIE_FLAGS) XORG_RELEASE_VERSION |