Update to xinit 1.4.0
This commit is contained in:
matthieu
parent
bb038f719e
commit
169077e610
@ -1,3 +1,205 @@
|
||||
commit 2df7937c6d57a4f44288d13fc50218fe088c4185
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Fri Mar 9 17:44:47 2018 -0800
|
||||
|
||||
xinit 1.4.0
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 2effad417dabccd0b41ac32dc8108c99c73801d2
|
||||
Author: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Mon Jan 30 21:35:37 2017 +0100
|
||||
|
||||
xinit: check for correct fork error code
|
||||
|
||||
Even though this code is only active on __sun machines, the fork return
|
||||
value should be checked for -1, not 1, to detect an error situation.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 710ea2cec2b36831a3b6b5bdae223d18edbea933
|
||||
Author: Mihail Konev <k.mvc@ya.ru>
|
||||
Date: Thu Jan 26 14:00:21 2017 +1000
|
||||
|
||||
autogen: add default patch prefix
|
||||
|
||||
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
|
||||
|
||||
commit 4345a602d48fbdf68e57db54e08f6a78d1679993
|
||||
Author: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Date: Mon Mar 9 12:00:52 2015 +0000
|
||||
|
||||
autogen.sh: use quoted string variables
|
||||
|
||||
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
|
||||
fall-outs, when they contain space.
|
||||
|
||||
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 762c1a8db1257246e23e0f9dfd876f97cb73e528
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Tue Jan 24 10:32:07 2017 +1000
|
||||
|
||||
autogen.sh: use exec instead of waiting for configure to finish
|
||||
|
||||
Syncs the invocation of configure with the one from the server.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
|
||||
|
||||
commit 4525e14fcfeaaf526227e3addec67d0ce4632270
|
||||
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Sat May 28 14:00:58 2016 -0700
|
||||
|
||||
startx: Add support for enabling IGLX for XQuartz
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=96260
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
commit 208a47e0d8f62e7c77fa42137511de890feea7fe
|
||||
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Sat May 28 13:47:01 2016 -0700
|
||||
|
||||
startx: Add -listen tcp if nolisten_tcp is disabled for XQuartz
|
||||
|
||||
https://bugs.freedesktop.org/show_bug.cgi?id=95379
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
commit 72160c42bea2073bf95c01aca59a12f0ca7ab707
|
||||
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Tue Dec 29 17:03:43 2015 -0800
|
||||
|
||||
launchd: Install binaries into libexecdir
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
commit 281b314f38564537279c94e605bee74ff41b0245
|
||||
Author: Ingo Schwarze <schwarze@usta.de>
|
||||
Date: Sun Aug 30 15:13:07 2015 +0200
|
||||
|
||||
remove bogus \/ escapes
|
||||
|
||||
some X manuals use then escape sequence \/ when they want to render
|
||||
a slash. That's bad because \/ is not a slash but an italic
|
||||
correction, never producing any output, having no effect at all in
|
||||
terminal output, and only changing spacing in a minor way in typeset
|
||||
output.
|
||||
|
||||
Signed-off-by: Matthieu Herrb <matthieu@herrb.eu>
|
||||
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
|
||||
commit c5e40f503420bd61c7a33e082db755c03c070c81
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Mar 25 11:04:13 2015 +1000
|
||||
|
||||
startx: don't init defaultdisplay to :0
|
||||
|
||||
This is misleading - it is always overwritten after looping through the lock
|
||||
files.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
|
||||
|
||||
commit e07fa99039c0f63ed8f0b142e546ef102321fca0
|
||||
Author: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri Mar 20 14:25:44 2015 +0100
|
||||
|
||||
startx: Fix startx picking an already used display number when -nolock is used
|
||||
|
||||
Currently startx relies on /tmp/.X?-lock being present for automatically
|
||||
picking a free display number. This does not work if -nolock is used when
|
||||
starting the server, or if the server is started with -displayfd as -displayfd
|
||||
implies -nolock.
|
||||
|
||||
This is becoming a problem now that -displayfd is getting used by
|
||||
display-managers (e.g. gdm), this fixes this by also checking for
|
||||
/tmp/.X11-unix/X?
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit a3a34a393b9aeacc0b41dc9b4608ad2be25564cf
|
||||
Author: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
Date: Wed Mar 25 11:08:45 2015 +1000
|
||||
|
||||
startx: fix comment typo
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 27488975a61858bbaf72047838074389566e2136
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Fri Feb 13 21:43:37 2015 -0500
|
||||
|
||||
Remove left over $(launchagents_DATA) in CLEANFILES
|
||||
|
||||
This was left over when reorganizing layout of launchd sources
|
||||
in commit 567f59d3f8189b92bc46e2af1260f9340f462bdb
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 1be5f1ae5df1d9b3f29fafe3eb29ea890a628b54
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Fri Feb 13 20:21:51 2015 -0500
|
||||
|
||||
Remove support for ancient A/UX 3.0 support
|
||||
|
||||
This was Apple Computer’s implementation of the Unix operating system
|
||||
for some of their Macintosh computers. From 1988 to 1995.
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 5268936259c598ea1e51370df33011a48ec9f3d4
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Fri Feb 13 19:37:16 2015 -0500
|
||||
|
||||
Remove SCO support for SHELL_CMD and startx man page.
|
||||
|
||||
SCO support was removed from startx.cpp and xinitrc.cpp earlier.
|
||||
|
||||
Remove unixware / sco support
|
||||
http://cgit.freedesktop.org/xorg/app/xinit/commit/
|
||||
?id=fdf03cd2fdfd9cd5635334c5e4dc2bb23e92e37a
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit e3bab0cc706880c22f2b205e7abad9d8c0227071
|
||||
Author: Mark Kettenis <kettenis@openbsd.org>
|
||||
Date: Thu Jan 29 11:23:01 2015 +0100
|
||||
|
||||
startx: Don't use GNU expr extensions
|
||||
|
||||
Use the ':' operator instead of "match" and avoid the use of "\+". Both
|
||||
constructions aren't specified by POSIX and not supported in BSD expr.
|
||||
Also drop the '^' from the regular expressions as it is implicit and
|
||||
POSIX leaves its behaviour undefined.
|
||||
|
||||
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
Acked-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
|
||||
|
||||
commit bd6cacdd36615e9b8136aeb86c3924a404785977
|
||||
Author: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Tue Jan 20 16:18:34 2015 +0100
|
||||
|
||||
startx: Pass -keeptty when telling the server to start on the current tty
|
||||
|
||||
Detaching from the tty causes systemd-logind to refuse service to the xserver,
|
||||
the xserver already tries to detect that it is being asked to run on the
|
||||
current tty and then automatically enables -keeptty, but this code fails if
|
||||
all of stdin, stdout and stderr are redirected to a file. So explicitly tell
|
||||
the xserver to not detach when we're telling it to run on the current tty.
|
||||
|
||||
BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1177513
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
|
||||
commit 6f6747d500439782476cf5c029a7fc45fc954c86
|
||||
Author: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Thu Sep 11 16:29:06 2014 +0200
|
||||
|
||||
@ -60,7 +60,7 @@ CPP_FILES_FLAGS = \
|
||||
xinitrc_DATA = xinitrc
|
||||
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = xinitrc startx $(launchagents_DATA)
|
||||
CLEANFILES = xinitrc startx
|
||||
|
||||
EXTRA_DIST = xinitrc.cpp startx.cpp \
|
||||
autogen.sh
|
||||
|
||||
@ -294,7 +294,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RAWCPP = @RAWCPP@
|
||||
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||
SCOMAN = @SCOMAN@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@ -413,7 +412,7 @@ CPP_FILES_FLAGS = \
|
||||
|
||||
xinitrc_DATA = xinitrc
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = xinitrc startx $(launchagents_DATA)
|
||||
CLEANFILES = xinitrc startx
|
||||
EXTRA_DIST = xinitrc.cpp startx.cpp \
|
||||
autogen.sh
|
||||
|
||||
|
||||
56
app/xinit/aclocal.m4
vendored
56
app/xinit/aclocal.m4
vendored
@ -1242,7 +1242,7 @@ AC_SUBST([am__untar])
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
dnl
|
||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||
dnl copy of this software and associated documentation files (the "Software"),
|
||||
@ -1279,7 +1279,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([vers_have], [1.19.2])
|
||||
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,,
|
||||
@ -1357,6 +1357,17 @@ AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_PROG_SED])
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
AC_CHECK_FILE([/usr/share/man/man7/attributes.7],
|
||||
[SYSV_MAN_SECTIONS=false], [SYSV_MAN_SECTIONS=true])
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
@ -1372,8 +1383,8 @@ if test x$LIB_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
@ -1382,8 +1393,8 @@ if test x$FILE_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
@ -1392,8 +1403,8 @@ if test x$MISC_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
@ -1402,8 +1413,8 @@ if test x$DRIVER_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
@ -1665,13 +1676,24 @@ m4_ifval([$1],
|
||||
fi])
|
||||
|
||||
# Test for the ability of xmlto to generate a text target
|
||||
#
|
||||
# NOTE: xmlto 0.0.27 or higher return a non-zero return code in the
|
||||
# following test for empty XML docbook files.
|
||||
# For compatibility reasons use the following empty XML docbook file and if
|
||||
# it fails try it again with a non-empty XML file.
|
||||
have_xmlto_text=no
|
||||
cat > conftest.xml << "EOF"
|
||||
EOF
|
||||
AS_IF([test "$have_xmlto" = yes],
|
||||
[AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
|
||||
[# Try it again with a non-empty XML file.
|
||||
cat > conftest.xml << "EOF"
|
||||
<x></x>
|
||||
EOF
|
||||
AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
|
||||
[have_xmlto_text=yes],
|
||||
[AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])])
|
||||
rm -f conftest.xml
|
||||
AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
@ -3067,8 +3089,9 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
AC_SUBST([INSTALL_CMD])
|
||||
]) # XORG_INSTALL
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
@ -3129,10 +3152,11 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
#
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
|
||||
@ -1,14 +1,17 @@
|
||||
#! /bin/sh
|
||||
|
||||
srcdir=`dirname $0`
|
||||
srcdir=`dirname "$0"`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
cd "$srcdir"
|
||||
|
||||
autoreconf -v --install || exit 1
|
||||
cd $ORIGDIR || exit $?
|
||||
cd "$ORIGDIR" || exit $?
|
||||
|
||||
git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
|
||||
git config --local format.subjectPrefix "PATCH app/xinit"
|
||||
|
||||
if test -z "$NOCONFIGURE"; then
|
||||
$srcdir/configure "$@"
|
||||
exec "$srcdir"/configure "$@"
|
||||
fi
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
|
||||
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
||||
84
app/xinit/configure
vendored
84
app/xinit/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xinit 1.3.4.
|
||||
# Generated by GNU Autoconf 2.69 for xinit 1.4.0.
|
||||
#
|
||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||
#
|
||||
@ -581,8 +581,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xinit'
|
||||
PACKAGE_TARNAME='xinit'
|
||||
PACKAGE_VERSION='1.3.4'
|
||||
PACKAGE_STRING='xinit 1.3.4'
|
||||
PACKAGE_VERSION='1.4.0'
|
||||
PACKAGE_STRING='xinit 1.4.0'
|
||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -641,7 +641,6 @@ XRDB
|
||||
XCONFIGFILEMAN
|
||||
XCONFIGFILE
|
||||
XSERVERNAME
|
||||
SCOMAN
|
||||
SHELL_CMD
|
||||
STARTX_COOKIE_FLAGS
|
||||
OPENSSL
|
||||
@ -1361,7 +1360,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xinit 1.3.4 to adapt to many kinds of systems.
|
||||
\`configure' configures xinit 1.4.0 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1431,7 +1430,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xinit 1.3.4:";;
|
||||
short | recursive ) echo "Configuration of xinit 1.4.0:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1572,7 +1571,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xinit configure 1.3.4
|
||||
xinit configure 1.4.0
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -1896,7 +1895,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xinit $as_me 1.3.4, which was
|
||||
It was created by xinit $as_me 1.4.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -2725,7 +2724,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xinit'
|
||||
VERSION='1.3.4'
|
||||
VERSION='1.4.0'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -10392,10 +10391,11 @@ _ACEOF
|
||||
|
||||
|
||||
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||
CHANGELOG_CMD="((GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp) 2>/dev/null && \
|
||||
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.changelog.tmp; test -e \$(top_srcdir)/ChangeLog || ( \
|
||||
touch \$(top_srcdir)/ChangeLog; \
|
||||
echo 'git failed to create ChangeLog: installing empty ChangeLog.' >&2))"
|
||||
|
||||
|
||||
|
||||
@ -10403,14 +10403,45 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; test -e \$(top_srcdir)/INSTALL || ( \
|
||||
touch \$(top_srcdir)/INSTALL; \
|
||||
echo 'failed to copy INSTALL from util-macros: installing empty INSTALL.' >&2))"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
case $host_os in
|
||||
solaris*)
|
||||
# Solaris 2.0 - 11.3 use SysV man page section numbers, so we
|
||||
# check for a man page file found in later versions that use
|
||||
# traditional section numbers instead
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5
|
||||
$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; }
|
||||
if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
test "$cross_compiling" = yes &&
|
||||
as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5
|
||||
if test -r "/usr/share/man/man7/attributes.7"; then
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=yes
|
||||
else
|
||||
ac_cv_file__usr_share_man_man7_attributes_7=no
|
||||
fi
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5
|
||||
$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; }
|
||||
if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then :
|
||||
SYSV_MAN_SECTIONS=false
|
||||
else
|
||||
SYSV_MAN_SECTIONS=true
|
||||
fi
|
||||
|
||||
;;
|
||||
*) SYSV_MAN_SECTIONS=false ;;
|
||||
esac
|
||||
|
||||
if test x$APP_MAN_SUFFIX = x ; then
|
||||
APP_MAN_SUFFIX=1
|
||||
fi
|
||||
@ -10426,8 +10457,8 @@ if test x$LIB_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$FILE_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) FILE_MAN_SUFFIX=4 ;;
|
||||
*) FILE_MAN_SUFFIX=5 ;;
|
||||
esac
|
||||
fi
|
||||
@ -10436,8 +10467,8 @@ if test x$FILE_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$MISC_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) MISC_MAN_SUFFIX=5 ;;
|
||||
*) MISC_MAN_SUFFIX=7 ;;
|
||||
esac
|
||||
fi
|
||||
@ -10446,8 +10477,8 @@ if test x$MISC_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) DRIVER_MAN_SUFFIX=7 ;;
|
||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||
esac
|
||||
fi
|
||||
@ -10456,8 +10487,8 @@ if test x$DRIVER_MAN_DIR = x ; then
|
||||
fi
|
||||
|
||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||
case $host_os in
|
||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||
case $SYSV_MAN_SECTIONS in
|
||||
true) ADMIN_MAN_SUFFIX=1m ;;
|
||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||
esac
|
||||
fi
|
||||
@ -11128,10 +11159,6 @@ case $host_os in
|
||||
*solaris*)
|
||||
SHELL_CMD="/bin/ksh"
|
||||
;;
|
||||
*sco*)
|
||||
SHELL_CMD="/bin/ksh"
|
||||
SCOMAN=1
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -11150,7 +11177,6 @@ esac
|
||||
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile man/Makefile launchd/Makefile launchd/privileged_startx/Makefile launchd/user_startx/Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
@ -11703,7 +11729,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xinit $as_me 1.3.4, which was
|
||||
This file was extended by xinit $as_me 1.4.0, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -11769,7 +11795,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xinit config.status 1.3.4
|
||||
xinit config.status 1.4.0
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([xinit], [1.3.4],
|
||||
AC_INIT([xinit], [1.4.0],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xinit])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
@ -203,13 +203,8 @@ case $host_os in
|
||||
*solaris*)
|
||||
SHELL_CMD="/bin/ksh"
|
||||
;;
|
||||
*sco*)
|
||||
SHELL_CMD="/bin/ksh"
|
||||
SCOMAN=1
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(SHELL_CMD)
|
||||
AC_SUBST(SCOMAN)
|
||||
AC_SUBST(XSERVERNAME)
|
||||
AC_SUBST(XCONFIGFILE)
|
||||
AC_SUBST(XCONFIGFILEMAN)
|
||||
|
||||
@ -186,7 +186,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RAWCPP = @RAWCPP@
|
||||
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||
SCOMAN = @SCOMAN@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
|
||||
@ -27,14 +27,14 @@
|
||||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
xinitrcdir = $(libdir)/X11/xinit
|
||||
xinitrcdir = $(XINITDIR)
|
||||
privstartxdir = $(xinitrcdir)/privileged_startx.d
|
||||
|
||||
xinitrc_PROGRAMS = privileged_startx
|
||||
libexec_PROGRAMS = privileged_startx
|
||||
privstartx_SCRIPTS = 10-tmpdirs 20-font_cache
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\"
|
||||
CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)"
|
||||
CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)"
|
||||
|
||||
if TIGER_LAUNCHD
|
||||
CPP_FILES_FLAGS += -DTIGER_LAUNCHD
|
||||
|
||||
@ -88,7 +88,7 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/cpprules.in $(top_srcdir)/depcomp
|
||||
xinitrc_PROGRAMS = privileged_startx$(EXEEXT)
|
||||
libexec_PROGRAMS = privileged_startx$(EXEEXT)
|
||||
@TIGER_LAUNCHD_TRUE@am__append_1 = -DTIGER_LAUNCHD
|
||||
subdir = launchd/privileged_startx
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -99,9 +99,9 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(xinitrcdir)" \
|
||||
am__installdirs = "$(DESTDIR)$(libexecdir)" \
|
||||
"$(DESTDIR)$(privstartxdir)" "$(DESTDIR)$(launchdaemonsdir)"
|
||||
PROGRAMS = $(xinitrc_PROGRAMS)
|
||||
PROGRAMS = $(libexec_PROGRAMS)
|
||||
dist_privileged_startx_OBJECTS = console_redirect.$(OBJEXT) \
|
||||
server.$(OBJEXT) client.$(OBJEXT) privileged_startx.$(OBJEXT)
|
||||
nodist_privileged_startx_OBJECTS = privileged_startxServer.$(OBJEXT) \
|
||||
@ -248,7 +248,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RAWCPP = @RAWCPP@
|
||||
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||
SCOMAN = @SCOMAN@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@ -337,13 +336,14 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
|
||||
-e '/\@\@$$/s/\@\@$$/\\/'
|
||||
|
||||
SUFFIXES = .cpp
|
||||
xinitrcdir = $(libdir)/X11/xinit
|
||||
xinitrcdir = $(XINITDIR)
|
||||
privstartxdir = $(xinitrcdir)/privileged_startx.d
|
||||
privstartx_SCRIPTS = 10-tmpdirs 20-font_cache
|
||||
AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBINDIR=\"$(bindir)\"
|
||||
CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" \
|
||||
-DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)" \
|
||||
-DBUNDLE_ID_PREFIX="$(bundleidprefix)" $(am__append_1)
|
||||
CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" \
|
||||
-DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" \
|
||||
-DBINDIR="$(bindir)" -DBUNDLE_ID_PREFIX="$(bundleidprefix)" \
|
||||
$(am__append_1)
|
||||
dist_privileged_startx_SOURCES = \
|
||||
$(srcdir)/../console_redirect.c \
|
||||
server.c \
|
||||
@ -411,12 +411,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
install-xinitrcPROGRAMS: $(xinitrc_PROGRAMS)
|
||||
install-libexecPROGRAMS: $(libexec_PROGRAMS)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(xinitrc_PROGRAMS)'; test -n "$(xinitrcdir)" || list=; \
|
||||
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(xinitrcdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(xinitrcdir)" || exit 1; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do echo "$$p $$p"; done | \
|
||||
sed 's/$(EXEEXT)$$//' | \
|
||||
@ -434,23 +434,23 @@ install-xinitrcPROGRAMS: $(xinitrc_PROGRAMS)
|
||||
while read type dir files; do \
|
||||
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||
test -z "$$files" || { \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(xinitrcdir)$$dir'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(xinitrcdir)$$dir" || exit $$?; \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
|
||||
} \
|
||||
; done
|
||||
|
||||
uninstall-xinitrcPROGRAMS:
|
||||
uninstall-libexecPROGRAMS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(xinitrc_PROGRAMS)'; test -n "$(xinitrcdir)" || list=; \
|
||||
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
||||
files=`for p in $$list; do echo "$$p"; done | \
|
||||
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
|
||||
-e 's/$$/$(EXEEXT)/' `; \
|
||||
test -n "$$list" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(xinitrcdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(xinitrcdir)" && rm -f $$files
|
||||
echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
|
||||
|
||||
clean-xinitrcPROGRAMS:
|
||||
-test -z "$(xinitrc_PROGRAMS)" || rm -f $(xinitrc_PROGRAMS)
|
||||
clean-libexecPROGRAMS:
|
||||
-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
|
||||
privileged_startx$(EXEEXT): $(privileged_startx_OBJECTS) $(privileged_startx_DEPENDENCIES) $(EXTRA_privileged_startx_DEPENDENCIES)
|
||||
@rm -f privileged_startx$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(privileged_startx_OBJECTS) $(privileged_startx_LDADD) $(LIBS)
|
||||
@ -653,7 +653,7 @@ check: $(BUILT_SOURCES)
|
||||
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||||
all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(xinitrcdir)" "$(DESTDIR)$(privstartxdir)" "$(DESTDIR)$(launchdaemonsdir)"; do \
|
||||
for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(privstartxdir)" "$(DESTDIR)$(launchdaemonsdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: $(BUILT_SOURCES)
|
||||
@ -691,7 +691,7 @@ maintainer-clean-generic:
|
||||
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-xinitrcPROGRAMS mostlyclean-am
|
||||
clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
@ -711,14 +711,13 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-launchdaemonsDATA install-privstartxSCRIPTS \
|
||||
install-xinitrcPROGRAMS
|
||||
install-data-am: install-launchdaemonsDATA install-privstartxSCRIPTS
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
install-exec-am:
|
||||
install-exec-am: install-libexecPROGRAMS
|
||||
|
||||
install-html: install-html-am
|
||||
|
||||
@ -757,26 +756,25 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-launchdaemonsDATA uninstall-privstartxSCRIPTS \
|
||||
uninstall-xinitrcPROGRAMS
|
||||
uninstall-am: uninstall-launchdaemonsDATA uninstall-libexecPROGRAMS \
|
||||
uninstall-privstartxSCRIPTS
|
||||
|
||||
.MAKE: all check install install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||
clean-xinitrcPROGRAMS cscopelist ctags distclean \
|
||||
clean-libexecPROGRAMS cscopelist ctags distclean \
|
||||
distclean-compile distclean-generic distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-launchdaemonsDATA \
|
||||
install-man install-pdf install-pdf-am \
|
||||
install-libexecPROGRAMS install-man install-pdf install-pdf-am \
|
||||
install-privstartxSCRIPTS install-ps install-ps-am \
|
||||
install-strip install-xinitrcPROGRAMS installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-launchdaemonsDATA \
|
||||
uninstall-privstartxSCRIPTS uninstall-xinitrcPROGRAMS
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
|
||||
tags uninstall uninstall-am uninstall-launchdaemonsDATA \
|
||||
uninstall-libexecPROGRAMS uninstall-privstartxSCRIPTS
|
||||
|
||||
|
||||
.cpp:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<string>BUNDLE_ID_PREFIX.privileged_startx</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>XINITDIR/privileged_startx</string>
|
||||
<string>__libexecdir__/privileged_startx</string>
|
||||
<string>-d</string>
|
||||
<string>SCRIPTDIR</string>
|
||||
</array>
|
||||
|
||||
@ -21,9 +21,7 @@
|
||||
|
||||
include $(top_srcdir)/cpprules.in
|
||||
|
||||
xinitrcdir = $(XINITDIR)
|
||||
|
||||
xinitrc_PROGRAMS = launchd_startx
|
||||
libexec_PROGRAMS = launchd_startx
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\"
|
||||
|
||||
@ -32,6 +30,7 @@ dist_launchd_startx_SOURCES = \
|
||||
launchd_startx.c
|
||||
|
||||
CPP_FILES_FLAGS = \
|
||||
-D__libexecdir__="$(libexecdir)" \
|
||||
-D__xinitrcdir__="$(xinitrcdir)" \
|
||||
-D__bindir__="$(bindir)" \
|
||||
-DBUNDLE_ID_PREFIX="$(bundleidprefix)"
|
||||
|
||||
@ -81,7 +81,7 @@ build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/cpprules.in $(top_srcdir)/depcomp
|
||||
xinitrc_PROGRAMS = launchd_startx$(EXEEXT)
|
||||
libexec_PROGRAMS = launchd_startx$(EXEEXT)
|
||||
@LAUNCHAGENT_XSERVER_TRUE@am__append_1 = -DLAUNCHAGENT_XSERVER_PATH="$(launchagentxserver)"
|
||||
subdir = launchd/user_startx
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
@ -92,9 +92,9 @@ mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(xinitrcdir)" \
|
||||
am__installdirs = "$(DESTDIR)$(libexecdir)" \
|
||||
"$(DESTDIR)$(launchagentsdir)"
|
||||
PROGRAMS = $(xinitrc_PROGRAMS)
|
||||
PROGRAMS = $(libexec_PROGRAMS)
|
||||
dist_launchd_startx_OBJECTS = console_redirect.$(OBJEXT) \
|
||||
launchd_startx.$(OBJEXT)
|
||||
launchd_startx_OBJECTS = $(dist_launchd_startx_OBJECTS)
|
||||
@ -236,7 +236,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RAWCPP = @RAWCPP@
|
||||
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||
SCOMAN = @SCOMAN@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
@ -325,14 +324,13 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
|
||||
-e '/\@\@$$/s/\@\@$$/\\/'
|
||||
|
||||
SUFFIXES = .cpp
|
||||
xinitrcdir = $(XINITDIR)
|
||||
AM_CPPFLAGS = -I$(srcdir)/.. -DXINITDIR=\"$(xinitrcdir)\" -DBINDIR=\"$(bindir)\"
|
||||
dist_launchd_startx_SOURCES = \
|
||||
$(srcdir)/../console_redirect.c \
|
||||
launchd_startx.c
|
||||
|
||||
CPP_FILES_FLAGS = -D__xinitrcdir__="$(xinitrcdir)" \
|
||||
-D__bindir__="$(bindir)" \
|
||||
CPP_FILES_FLAGS = -D__libexecdir__="$(libexecdir)" \
|
||||
-D__xinitrcdir__="$(xinitrcdir)" -D__bindir__="$(bindir)" \
|
||||
-DBUNDLE_ID_PREFIX="$(bundleidprefix)" $(am__append_1)
|
||||
launchagents_PRE = $(bundleidprefix).startx.plist.cpp
|
||||
launchagents_DATA = $(launchagents_PRE:plist.cpp=plist)
|
||||
@ -376,12 +374,12 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
install-xinitrcPROGRAMS: $(xinitrc_PROGRAMS)
|
||||
install-libexecPROGRAMS: $(libexec_PROGRAMS)
|
||||
@$(NORMAL_INSTALL)
|
||||
@list='$(xinitrc_PROGRAMS)'; test -n "$(xinitrcdir)" || list=; \
|
||||
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
||||
if test -n "$$list"; then \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(xinitrcdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(xinitrcdir)" || exit 1; \
|
||||
echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \
|
||||
$(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \
|
||||
fi; \
|
||||
for p in $$list; do echo "$$p $$p"; done | \
|
||||
sed 's/$(EXEEXT)$$//' | \
|
||||
@ -399,23 +397,23 @@ install-xinitrcPROGRAMS: $(xinitrc_PROGRAMS)
|
||||
while read type dir files; do \
|
||||
if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
|
||||
test -z "$$files" || { \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(xinitrcdir)$$dir'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(xinitrcdir)$$dir" || exit $$?; \
|
||||
echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
|
||||
$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
|
||||
} \
|
||||
; done
|
||||
|
||||
uninstall-xinitrcPROGRAMS:
|
||||
uninstall-libexecPROGRAMS:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(xinitrc_PROGRAMS)'; test -n "$(xinitrcdir)" || list=; \
|
||||
@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
|
||||
files=`for p in $$list; do echo "$$p"; done | \
|
||||
sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
|
||||
-e 's/$$/$(EXEEXT)/' `; \
|
||||
test -n "$$list" || exit 0; \
|
||||
echo " ( cd '$(DESTDIR)$(xinitrcdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(xinitrcdir)" && rm -f $$files
|
||||
echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
|
||||
cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
|
||||
|
||||
clean-xinitrcPROGRAMS:
|
||||
-test -z "$(xinitrc_PROGRAMS)" || rm -f $(xinitrc_PROGRAMS)
|
||||
clean-libexecPROGRAMS:
|
||||
-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
|
||||
launchd_startx$(EXEEXT): $(launchd_startx_OBJECTS) $(launchd_startx_DEPENDENCIES) $(EXTRA_launchd_startx_DEPENDENCIES)
|
||||
@rm -f launchd_startx$(EXEEXT)
|
||||
$(AM_V_CCLD)$(LINK) $(launchd_startx_OBJECTS) $(launchd_startx_LDADD) $(LIBS)
|
||||
@ -578,7 +576,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(PROGRAMS) $(DATA)
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(xinitrcdir)" "$(DESTDIR)$(launchagentsdir)"; do \
|
||||
for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(launchagentsdir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -614,7 +612,7 @@ maintainer-clean-generic:
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-generic clean-xinitrcPROGRAMS mostlyclean-am
|
||||
clean-am: clean-generic clean-libexecPROGRAMS mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
-rm -rf ./$(DEPDIR)
|
||||
@ -634,13 +632,13 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-launchagentsDATA install-xinitrcPROGRAMS
|
||||
install-data-am: install-launchagentsDATA
|
||||
|
||||
install-dvi: install-dvi-am
|
||||
|
||||
install-dvi-am:
|
||||
|
||||
install-exec-am:
|
||||
install-exec-am: install-libexecPROGRAMS
|
||||
|
||||
install-html: install-html-am
|
||||
|
||||
@ -679,24 +677,24 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-launchagentsDATA uninstall-xinitrcPROGRAMS
|
||||
uninstall-am: uninstall-launchagentsDATA uninstall-libexecPROGRAMS
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
|
||||
clean-xinitrcPROGRAMS cscopelist ctags distclean \
|
||||
clean-libexecPROGRAMS cscopelist ctags distclean \
|
||||
distclean-compile distclean-generic distclean-tags distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-launchagentsDATA \
|
||||
install-man install-pdf install-pdf-am install-ps \
|
||||
install-ps-am install-strip install-xinitrcPROGRAMS \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
install-libexecPROGRAMS install-man install-pdf install-pdf-am \
|
||||
install-ps install-ps-am install-strip installcheck \
|
||||
installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-launchagentsDATA \
|
||||
uninstall-xinitrcPROGRAMS
|
||||
uninstall-libexecPROGRAMS
|
||||
|
||||
|
||||
.cpp:
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<string>BUNDLE_ID_PREFIX.startx</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>__xinitrcdir__/launchd_startx</string>
|
||||
<string>__libexecdir__/launchd_startx</string>
|
||||
<string>__bindir__/startx</string>
|
||||
#ifdef LAUNCHAGENT_XSERVER_PATH
|
||||
<string>--</string>
|
||||
|
||||
@ -13,7 +13,6 @@ MAN_SUBSTS+= -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' \
|
||||
-e 's|__xinitdir__|$(XINITDIR)|g' \
|
||||
-e 's|__bindir__|$(bindir)|g' \
|
||||
-e 's|__libdir__|$(libdir)|g' \
|
||||
-e 's|__SCOMAN__|$(SCOMAN)|g' \
|
||||
-e 's|__configdir__|$(XINITDIR)|g'
|
||||
|
||||
|
||||
|
||||
@ -160,7 +160,7 @@ MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__XSERVERNAME__|$(XSERVERNAME)|g' -e \
|
||||
's|__XCONFIGFILE__|$(XCONFIGFILE)|g' -e \
|
||||
's|__XCONFIGFILEMAN__|$(XCONFIGFILEMAN)|g' -e \
|
||||
's|__xinitdir__|$(XINITDIR)|g' -e 's|__bindir__|$(bindir)|g' \
|
||||
-e 's|__libdir__|$(libdir)|g' -e 's|__SCOMAN__|$(SCOMAN)|g' -e \
|
||||
-e 's|__libdir__|$(libdir)|g' -e \
|
||||
's|__configdir__|$(XINITDIR)|g'
|
||||
MCOOKIE = @MCOOKIE@
|
||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||
@ -181,7 +181,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||
RAWCPP = @RAWCPP@
|
||||
RAWCPPFLAGS = @RAWCPPFLAGS@
|
||||
SCOMAN = @SCOMAN@
|
||||
SED = @SED@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
|
||||
@ -74,7 +74,6 @@ startx -- -dpi 100
|
||||
.PP
|
||||
startx -- -layout Multihead
|
||||
.RE
|
||||
.if '__SCOMAN__'' .ig
|
||||
.PP
|
||||
To determine the client to run,
|
||||
.B startx
|
||||
@ -90,20 +89,6 @@ looks for the following files, in order:
|
||||
.I __xinitdir__/xinitrc
|
||||
.RE
|
||||
.PP
|
||||
..
|
||||
.if !'x.__SCOMAN__'x.' .ig
|
||||
.PP
|
||||
To determine the client to run,
|
||||
.B startx
|
||||
first looks for a file called
|
||||
.I .xinitrc
|
||||
in the user's home directory. If that is not found, it uses
|
||||
the file
|
||||
.I xinitrc
|
||||
in the
|
||||
.I xinit
|
||||
library directory.
|
||||
..
|
||||
If command line client options are given, they override this
|
||||
behavior and revert to the
|
||||
.BR xinit (__appmansuffix__)
|
||||
@ -187,17 +172,6 @@ and
|
||||
.IR Xsecurity (__miscmansuffix__)
|
||||
manual pages for more information on X client/server authentication.
|
||||
.SH FILES
|
||||
.if '__SCOMAN__'' .ig
|
||||
.TP 25
|
||||
.I $(HOME)/.startxrc
|
||||
Client to run. Typically a shell script which runs many programs in
|
||||
the background.
|
||||
.TP 25
|
||||
.I __libdir__/sys.startxrc
|
||||
Client to use if the user has no
|
||||
.I .startxrc
|
||||
file.
|
||||
..
|
||||
.TP 25
|
||||
.I $(HOME)/.xinitrc
|
||||
Client to run. Typically a shell script which runs many programs in
|
||||
|
||||
@ -56,7 +56,7 @@ defaultclient=XTERM
|
||||
defaultserver=XSERVER
|
||||
defaultclientargs=""
|
||||
defaultserverargs=""
|
||||
defaultdisplay=":0"
|
||||
defaultdisplay=""
|
||||
clientargs=""
|
||||
serverargs=""
|
||||
vtarg=""
|
||||
@ -80,6 +80,10 @@ if ! defaults read $X11_PREFS_DOMAIN nolisten_tcp > /dev/null 2>&1 ; then
|
||||
defaults write $X11_PREFS_DOMAIN nolisten_tcp -bool true
|
||||
fi
|
||||
|
||||
if ! defaults read $X11_PREFS_DOMAIN enable_iglx > /dev/null 2>&1 ; then
|
||||
defaults write $X11_PREFS_DOMAIN enable_iglx -bool false
|
||||
fi
|
||||
|
||||
XCOMM First, start caching fonts
|
||||
if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then
|
||||
if [ -x $bindir/font_cache ] ; then
|
||||
@ -91,10 +95,10 @@ if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -x XINITDIR/privileged_startx ] ; then
|
||||
if [ -x __libexecdir__/privileged_startx ] ; then
|
||||
# Don't push this into the background becasue it can cause
|
||||
# a race to create /tmp/.X11-unix
|
||||
XINITDIR/privileged_startx
|
||||
__libexecdir__/privileged_startx
|
||||
fi
|
||||
|
||||
if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then
|
||||
@ -105,6 +109,14 @@ fi
|
||||
|
||||
if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then
|
||||
defaultserverargs="$defaultserverargs -nolisten tcp"
|
||||
else
|
||||
defaultserverargs="$defaultserverargs -listen tcp"
|
||||
fi
|
||||
|
||||
if [ x`defaults read $X11_PREFS_DOMAIN enable_iglx` = x1 ] ; then
|
||||
defaultserverargs="$defaultserverargs +iglx"
|
||||
else
|
||||
defaultserverargs="$defaultserverargs -iglx"
|
||||
fi
|
||||
|
||||
XCOMM The second check is the real one. The first is to hopefully avoid
|
||||
@ -120,7 +132,7 @@ enable_xauth=1
|
||||
XCOMM Automatically determine an unused $DISPLAY
|
||||
d=0
|
||||
while true ; do
|
||||
[ -e /tmp/.X$d-lock ] || break
|
||||
[ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
|
||||
d=$(($d + 1))
|
||||
done
|
||||
defaultdisplay=":$d"
|
||||
@ -195,7 +207,7 @@ if [ x"$server" = x ]; then
|
||||
tty=$(tty)
|
||||
if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then
|
||||
tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
|
||||
vtarg="vt$tty_num"
|
||||
vtarg="vt$tty_num -keeptty"
|
||||
fi
|
||||
#endif
|
||||
|
||||
@ -283,7 +295,7 @@ EOF
|
||||
|
||||
XCOMM now add the same credentials to the client authority file
|
||||
XCOMM if '$displayname' already exists do not overwrite it as another
|
||||
XCOMM server man need it. Add them to the '$xserverauthfile' instead.
|
||||
XCOMM server may need it. Add them to the '$xserverauthfile' instead.
|
||||
for displayname in $authdisplay $hostname$authdisplay; do
|
||||
authcookie=`XAUTH list "$displayname" @@
|
||||
| sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
|
||||
@ -326,11 +338,6 @@ if command -v deallocvt > /dev/null 2>&1; then
|
||||
fi
|
||||
#endif
|
||||
|
||||
#ifdef macII
|
||||
Xrepair
|
||||
screenrestore
|
||||
#endif
|
||||
|
||||
#if defined(sun)
|
||||
kbd_mode -a
|
||||
#endif
|
||||
|
||||
@ -638,7 +638,7 @@ shutdown(void)
|
||||
Fatal("Unable to run program \"%s\"", "kbd_mode");
|
||||
break;
|
||||
|
||||
case 1:
|
||||
case -1:
|
||||
Error("fork failed");
|
||||
break;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user