Looks fine to me. On NetBSD: checking for openssl... /usr/bin/openssl configure: startx will depend on "/usr/bin/openssl rand -hex 16" to generate xauth cookies
Reviewed-by: Thomas Klausner <[email protected]> Thomas On Sat, Aug 03, 2013 at 12:20:33AM -0700, Alan Coopersmith wrote: > Configure will notify the builder which cookie maker it chooses, > so that packagers can add a dependency on the program needed. > > Signed-off-by: Alan Coopersmith <[email protected]> > --- > configure.ac | 27 ++++++++++++++++++--------- > 1 file changed, 18 insertions(+), 9 deletions(-) > > diff --git a/configure.ac b/configure.ac > index c7fb0ab..0900bf1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -153,17 +153,26 @@ esac > AC_PATH_PROGS(MCOOKIE, [mcookie], [$MCOOKIE], > [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/local/bin]) > > -case $host_os in > - *openbsd*) > - MCOOKIE='/usr/sbin/openssl rand -hex 16' > - ;; > - *solaris*) > - MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | /usr/bin/tr -d ' '" > - ;; > -esac > - > +# If mcookie not found, try openssl, else per-system fallbacks > +if test "x$MCOOKIE" = x ; then > + AC_PATH_PROGS(OPENSSL, [openssl], [$OPENSSL], > + [$PATH:/bin:/usr/bin:/usr/sbin:/usr/lib:/usr/libexec:/usr/local/bin]) > + if test "x$OPENSSL" != x ; then > + MCOOKIE="$OPENSSL rand -hex 16" > + else > + case $host_os in > + *openbsd*) > + MCOOKIE='/usr/sbin/openssl rand -hex 16' > + ;; > + *solaris*) > + MCOOKIE="/usr/bin/od -X -A n -N 16 /dev/urandom | > /usr/bin/tr -d ' '" > + ;; > + esac > + fi > +fi > if test "x$MCOOKIE" != x ; then > STARTX_COOKIE_FLAGS='-DHAS_COOKIE_MAKER -DMK_COOKIE="$(MCOOKIE)"' > + AC_MSG_NOTICE([startx will depend on "$MCOOKIE" to generate xauth > cookies]) > fi > AC_SUBST(STARTX_COOKIE_FLAGS) > > -- > 1.7.9.2 > > _______________________________________________ > [email protected]: X.Org development > Archives: http://lists.x.org/archives/xorg-devel > Info: http://lists.x.org/mailman/listinfo/xorg-devel > _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
