diff options
| author | Keith Packard <keithp@keithp.com> | 2014-09-12 11:33:48 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-09-22 13:52:20 -0700 |
| commit | cc59be38b7eff52a1d003b390f2994c73ee0b3e9 (patch) | |
| tree | aef5ce0c2a058e71f383dbd36e9101f81d718968 /configure.ac | |
| parent | 8ada3fb32cd7dd8948eb55620de18ba03df6131d (diff) | |
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 'configure.ac')
| -rw-r--r-- | configure.ac | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9066a6f73..51e0f1fd1 100644 --- a/configure.ac +++ b/configure.ac @@ -461,6 +461,16 @@ AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name o AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]), [ BUILDERSTRING="$withval" ] [ ]) +AC_ARG_ENABLE(listen-tcp, AS_HELP_STRING([--enable-listen-tcp], + [Listen on TCP by default (default:disabled)]), + [LISTEN_TCP=$enableval], [LISTEN_TCP=no]) +AC_ARG_ENABLE(listen-unix, AS_HELP_STRING([--disable-listen-unix], + [Listen on Unix by default (default:enabled)]), + [LISTEN_UNIX=$enableval], [LISTEN_UNIX=yes]) + +AC_ARG_ENABLE(listen-local, AS_HELP_STRING([--disable-listen-local], + [Listen on local by default (default:enabled)]), + [LISTEN_LOCAL=$enableval], [LISTEN_LOCAL=yes]) dnl Determine font path XORG_FONTROOTDIR @@ -1053,6 +1063,16 @@ if test "x$RES" = xyes; then SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $RESOURCEPROTO" fi +if test "x$LISTEN_TCP" = xyes; then + AC_DEFINE(LISTEN_TCP, 1, [Listen on TCP socket]) +fi +if test "x$LISTEN_UNIX" = xyes; then + AC_DEFINE(LISTEN_UNIX, 1, [Listen on Unix socket]) +fi +if test "x$LISTEN_LOCAL" = xyes; then + AC_DEFINE(LISTEN_LOCAL, 1, [Listen on local socket]) +fi + # The XRes extension may support client ID tracking only if it has # been specifically enabled. Client ID tracking is implicitly not # supported if XRes extension is disabled. |