summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2006-04-30 14:19:19 +0000
committerMatthieu Herrb <matthieu.herrb@laas.fr>2006-04-30 14:19:19 +0000
commitdb74ad799da27eec04b5aed64e3564aef9156a04 (patch)
tree9c379b6d62ee5072d389a21993c63ed009508aef
parent797f51d176ab9a29497a9141a57a968c5a7d3792 (diff)
Quote MCOOKIE to allow to specify a command with args (ie
MCOOKIE="/usr/sbin/openssl rand -hex 16" ./configure ...)
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 569a6c7..8d8943a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-30 Matthieu Herrb <matthieu.herrb@laas.fr>
+
+ * configure.ac:
+ Quote MCOOKIE to allow to specify a command with args (ie
+ MCOOKIE="/usr/sbin/openssl rand -hex 16" ./configure ...)
+
2006-04-01 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index c2e5e0d..8ce3daa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,8 +104,8 @@ AC_SUBST(XINIT_LIBS)
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)'
+if test "x$MCOOKIE" != x ; then
+ STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"'
fi
AC_SUBST(STARTX_COOKIE_FLAGS)