diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-20 10:03:58 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-20 10:03:58 +0000 |
| commit | ecb42d928335a3e6b083cdae174b326793079d69 (patch) | |
| tree | bd5343198d15999d7395bf39d0099fa295a69a5a /xserver/aclocal.m4 | |
| parent | 70ce255848dcb87fd04c970a1707a1966136912b (diff) | |
Merge from upstream: Don't listen to 'tcp' by default. Add '-listen' option.
commit cc59be38b7eff52a1d003b390f2994c73ee0b3e9
Author: Keith Packard <keithp@keithp.com>
Date: Fri Sep 12 11:33:48 2014 -0700
os: Don't listen to 'tcp' by default. Add '-listen' option. [v2]
This disables the tcp listen socket by default. Then, it
uses a new xtrans interface, TRANS(Listen), to provide a command line
option to re-enable those if desired.
v2: Leave unix socket enabled by default. Add configure options.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'xserver/aclocal.m4')
| -rw-r--r-- | xserver/aclocal.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xserver/aclocal.m4 b/xserver/aclocal.m4 index f0dad92b7..340baff19 100644 --- a/xserver/aclocal.m4 +++ b/xserver/aclocal.m4 @@ -1231,7 +1231,7 @@ m4_include([m4/lt~obsolete.m4]) m4_include([m4/xorg-tls.m4]) dnl fontutil.m4. Generated from fontutil.m4.in by configure. dnl -dnl This file comes from X.Org's font-util 1.3.0 +dnl This file comes from X.Org's font-util 1.3.1 dnl dnl Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. dnl @@ -1296,7 +1296,7 @@ dnl from the copyright holders. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_FONT_MACROS_VERSION],[ -m4_define([vers_have], [1.3.0]) +m4_define([vers_have], [1.3.1]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1513,10 +1513,11 @@ AC_DEFUN([XORG_FONT_CHECK_COMPRESSION],[ # by ucs2any, and export it as MAPFILES_PATH to the Makefiles AC_DEFUN([XORG_FONT_UCS2ANY],[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) XORG_FONT_REQUIRED_PROG(UCS2ANY, ucs2any) PKG_CHECK_MODULES(MAPS, [fontutil]) AC_MSG_CHECKING([for ucs2any encoding data files]) - MAPFILES_PATH=`pkg-config --variable=mapdir fontutil` + MAPFILES_PATH=`$PKG_CONFIG --variable=mapdir fontutil` AC_SUBST(MAPFILES_PATH) AC_MSG_RESULT([${MAPFILES_PATH}]) ]) |