qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to twm 1.0.6. No functional change.

Browse Source
This commit is contained in:
matthieu 2011-01-22 14:24:55 +00:00
parent cf9b06cfa2
commit 191e43de2c
5 changed files with 82 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/twm/ChangeLog
View File

@ -1,3 +1,33 @@
commit b160f7bcb99111e631d6701b199f1dad1e40c80d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 5 14:09:15 2011 -0800
twm 1.0.6
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1347a210cafa75db40198f8f9e3ca36f8e627bf6
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 24 15:28:47 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 1ca7092e44e87038ba95a962a3c952ef72b4f146
Author: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon Nov 1 09:54:44 2010 +0100
config: replace AC_CHECK_FILE with test -f
* AC_CHECK_FILE doesn't work for cross compilation
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit b3af92c7bca31b3bf73428d46291b88c3f86026e commit b3af92c7bca31b3bf73428d46291b88c3f86026e
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Oct 30 15:03:50 2010 -0700 Date: Sat Oct 30 15:03:50 2010 -0700

12
app/twm/aclocal.m4 vendored
View File

@ -498,18 +498,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
]) ])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*- # Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005

59
app/twm/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62 for twm 1.0.5. # Generated by GNU Autoconf 2.62 for twm 1.0.6.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
# #
@ -596,10 +596,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package. # Identity of this package.
PACKAGE_NAME='twm' PACKAGE_NAME='twm'
PACKAGE_TARNAME='twm' PACKAGE_TARNAME='twm'
PACKAGE_VERSION='1.0.5' PACKAGE_VERSION='1.0.6'
PACKAGE_STRING='twm 1.0.5' PACKAGE_STRING='twm 1.0.6'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
# Factoring default headers for most tests. # Factoring default headers for most tests.
ac_includes_default="\ ac_includes_default="\
#include <stdio.h> #include <stdio.h>
@ -1327,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures twm 1.0.5 to adapt to many kinds of systems. \`configure' configures twm 1.0.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1397,7 +1398,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of twm 1.0.5:";; short | recursive ) echo "Configuration of twm 1.0.6:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1497,7 +1498,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
twm configure 1.0.5 twm configure 1.0.6
generated by GNU Autoconf 2.62 generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1511,7 +1512,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by twm $as_me 1.0.5, which was It was created by twm $as_me 1.0.6, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@ $ $0 $@
@ -1877,6 +1878,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
# Initialize Automake
am__api_version="1.9" am__api_version="1.9"
ac_aux_dir= ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@ -2160,7 +2166,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='twm' PACKAGE='twm'
VERSION='1.0.5' VERSION='1.0.6'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2331,9 +2337,6 @@ fi
ac_config_headers="$ac_config_headers config.h"
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@ -4986,35 +4989,13 @@ $as_echo "no" >&6; }
fi fi
as_ac_File=`$as_echo "ac_cv_file_$srcdir/gram.c" | $as_tr_sh` if test ! -f "$srcdir/gram.c"; then
{ $as_echo "$as_me:$LINENO: checking for $srcdir/gram.c" >&5 if test -z "$YACC_INST"; then
$as_echo_n "checking for $srcdir/gram.c... " >&6; } { { $as_echo "$as_me:$LINENO: error: yacc not found - unable to compile gram.y" >&5
if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
test "$cross_compiling" = yes &&
{ { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
{ (exit 1); exit 1; }; }
if test -r "$srcdir/gram.c"; then
eval "$as_ac_File=yes"
else
eval "$as_ac_File=no"
fi
fi
ac_res=`eval 'as_val=${'$as_ac_File'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if test `eval 'as_val=${'$as_ac_File'}
$as_echo "$as_val"'` = yes; then
:
else
test -z "$YACC_INST" && { { $as_echo "$as_me:$LINENO: error: yacc not found - unable to compile gram.y" >&5
$as_echo "$as_me: error: yacc not found - unable to compile gram.y" >&2;} $as_echo "$as_me: error: yacc not found - unable to compile gram.y" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi
fi fi
for ac_prog in flex lex for ac_prog in flex lex
do do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
@ -5885,7 +5866,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by twm $as_me 1.0.5, which was This file was extended by twm $as_me 1.0.6, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -5938,7 +5919,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
twm config.status 1.0.5 twm config.status 1.0.6
configured by $0, generated by GNU Autoconf 2.62, configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

16
app/twm/configure.ac
View File

@ -20,14 +20,17 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([twm], [1.0.5], AC_INIT([twm], [1.0.6],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm]) [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION], m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
@ -36,8 +39,11 @@ XORG_DEFAULT_OPTIONS
AC_PROG_YACC AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC) AC_PATH_PROG([YACC_INST], $YACC)
AC_CHECK_FILE([$srcdir/gram.c], [], if test ! -f "$srcdir/gram.c"; then
[test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile gram.y])]) if test -z "$YACC_INST"; then
AC_MSG_ERROR([yacc not found - unable to compile gram.y])
fi
fi
AC_PROG_LEX AC_PROG_LEX
AC_CHECK_FUNCS([mkstemp]) AC_CHECK_FUNCS([mkstemp])

45
app/twm/man/Makefile.in
View File

@ -15,30 +15,27 @@
@SET_MAKE@ @SET_MAKE@
# #
# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
# #
# Permission to use, copy, modify, distribute, and sell this software and its # Permission is hereby granted, free of charge, to any person obtaining a
# documentation for any purpose is hereby granted without fee, provided that # copy of this software and associated documentation files (the "Software"),
# the above copyright notice appear in all copies and that both that # to deal in the Software without restriction, including without limitation
# copyright notice and this permission notice appear in supporting # the rights to use, copy, modify, merge, publish, distribute, sublicense,
# documentation. # and/or sell copies of the Software, and to permit persons to whom the
# # Software is furnished to do so, subject to the following conditions:
# The above copyright notice and this permission notice shall be included #
# in all copies or substantial portions of the Software. # The above copyright notice and this permission notice (including the next
# # paragraph) shall be included in all copies or substantial portions of the
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS # Software.
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF #
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# OTHER DEALINGS IN THE SOFTWARE. # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# Except as contained in this notice, the name of the copyright holders shall # DEALINGS IN THE SOFTWARE.
# not be used in advertising or otherwise to promote the sale, use or #
# other dealings in this Software without prior written authorization
# from the copyright holders.
#
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@