Hello community, here is the log from the commit of package appres for openSUSE:Factory checked in at 2013-05-27 09:33:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appres (Old) and /work/SRC/openSUSE:Factory/.appres.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "appres" Changes: -------- --- /work/SRC/openSUSE:Factory/appres/appres.changes 2012-05-08 11:55:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.appres.new/appres.changes 2013-05-27 09:33:52.000000000 +0200 @@ -1,0 +2,14 @@ +Mon May 20 21:13:07 UTC 2013 - [email protected] + +- Update to version 1.0.4: + + Add -V option to print command version. + + Combine usage message into a single string. + + Mark usage() as _X_NORETURN to satisfy -Wmissing-noreturn + warning. + + config: move man pages into their own directory. + + man: replace hard coded man page section with substitution + strings. + + man: remove trailing spaces and tabs. +- Add pkgconfig(xproto), configure now checks for it. + +------------------------------------------------------------------- Old: ---- appres-1.0.3.tar.bz2 New: ---- appres-1.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appres.spec ++++++ --- /var/tmp/diff_new_pack.rRpplE/_old 2013-05-27 09:33:53.000000000 +0200 +++ /var/tmp/diff_new_pack.rRpplE/_new 2013-05-27 09:33:53.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package appres # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: appres -Version: 1.0.3 +Version: 1.0.4 Release: 0 -License: MIT Summary: Utility to list the resource database of an X application -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.17 BuildRequires: pkgconfig(xt) # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 ++++++ appres-1.0.3.tar.bz2 -> appres-1.0.4.tar.bz2 ++++++ ++++ 13405 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/ChangeLog new/appres-1.0.4/ChangeLog --- old/appres-1.0.3/ChangeLog 2010-10-31 19:51:23.000000000 +0100 +++ new/appres-1.0.4/ChangeLog 2013-05-18 02:39:47.000000000 +0200 @@ -1,3 +1,82 @@ +commit f189c64e3576956816da9f46909437f5523ded3b +Author: Alan Coopersmith <[email protected]> +Date: Fri May 17 17:39:13 2013 -0700 + + appres 1.0.4 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 849880e1cca492665a7c8581e5591065299ab718 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 19 11:33:48 2013 -0800 + + Add -V option to print command version + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 590aa5f17cd4b8d710662e6af701c166392d0235 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 19 11:21:29 2013 -0800 + + Combine usage message into a single string + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 766a467795cd9e58cd9ea0266dd6a5b54403aac8 +Author: Alan Coopersmith <[email protected]> +Date: Sat Jan 19 11:18:33 2013 -0800 + + Mark usage() as _X_NORETURN to satisfy -Wmissing-noreturn warning + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5fe00fdffe8ec04f8ad04617a2b26ff282049a4c +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 13 13:48:00 2011 -0400 + + .gitignore: fix typo + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 0497e70e490eb30c6062555cce16c87e81523b0b +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 13 13:41:27 2011 -0400 + + .gitignore: the original copy was somewhat broken + + Only comments, nothing functional + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 3450c1498afe0fc8beabf70f864d241f54e7a3a4 +Author: Gaetan Nadon <[email protected]> +Date: Wed Jan 19 10:06:55 2011 -0500 + + config: move man pages into their own directory + + Use services provided by XORG_MANPAGE_SECTIONS. + Use standard Makefile for man pages. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 38d38caed7d7c7a359dc9ff5517a72f3b25c4277 +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 13 17:15:36 2011 -0500 + + man: replace hard coded man page section with substitution strings + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit eb5186583f9b99b8ae71db14835319270db5cba2 +Author: Gaetan Nadon <[email protected]> +Date: Thu Jan 13 11:15:00 2011 -0500 + + man: remove trailing spaces and tabs + + Using s/[ \t]*$// + + Signed-off-by: Gaetan Nadon <[email protected]> + commit 65538c8269ac6d29affa47ef54fa7f606174257a Author: Alan Coopersmith <[email protected]> Date: Sun Oct 31 11:50:55 2010 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/Makefile.am new/appres-1.0.4/Makefile.am --- old/appres-1.0.3/Makefile.am 2010-07-02 03:40:57.000000000 +0200 +++ new/appres-1.0.4/Makefile.am 2013-05-18 02:39:21.000000000 +0200 @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = appres AM_CFLAGS = $(APPRES_CFLAGS) $(CWARNFLAGS) @@ -27,17 +28,7 @@ appres_SOURCES = \ appres.c -appman_PRE = \ - appres.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - .PHONY: ChangeLog INSTALL @@ -49,8 +40,4 @@ dist-hook: ChangeLog INSTALL -SUFFIXES = .$(APP_MAN_SUFFIX) .man -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/appres.c new/appres-1.0.4/appres.c --- old/appres-1.0.3/appres.c 2010-10-07 05:30:03.000000000 +0200 +++ new/appres-1.0.4/appres.c 2013-05-18 02:39:21.000000000 +0200 @@ -25,6 +25,10 @@ * Author: Jim Fulton, MIT X Consortium */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include <X11/Intrinsic.h> #include <stdio.h> #include <stdlib.h> @@ -35,16 +39,15 @@ static XrmQuark XrmQString; -static void +static void _X_NORETURN usage (void) { fprintf (stderr, - "usage: %s [class [instance]] [-1] [toolkitoptions]\n", + "usage: %s [class [instance]] [-1] [-V] [toolkitoptions]\n" + "-1 list resources only at the specified level\n" + "-V print command version and exit\n" + "The number of class and instance elements must be equal.\n", ProgramName); - fprintf (stderr, - "-1 list resources only at the specified level\n"); - fprintf (stderr, - "The number of class and instance elements must be equal.\n"); exit (1); } @@ -149,6 +152,10 @@ for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-1")) mode = XrmEnumOneLevel; + else if (!strcmp(argv[i], "-V")) { + printf("%s\n", PACKAGE_STRING); + exit(0); + } else if (argv[i][0] == '-') usage(); else if (!cname) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/appres.man new/appres-1.0.4/appres.man --- old/appres-1.0.3/appres.man 2010-10-07 05:30:03.000000000 +0200 +++ new/appres-1.0.4/appres.man 1970-01-01 01:00:00.000000000 +0100 @@ -1,89 +0,0 @@ -.\" Copyright 1993, 1994, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER 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 DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.TH APPRES 1 __xorgversion__ -.SH NAME -appres \- list X application resource database -.SH SYNOPSIS -.B "appres" -[class [instance]] [\-1] [toolkitoptions] -.SH DESCRIPTION -.PP -The \fIappres\fP program prints the resources seen by an application -(or subhierarchy of an application) with the specified \fIclass\fP and -\fIinstance\fP names. It can be used to determine which -resources a particular program will load. For example, -.sp 1 -.in +.5i -.nf -% appres XTerm -.fi -.in -.5i -.sp 1 -will list the resources that any \fIxterm\fP program will load. -If no application class is specified, the class \fI-AppResTest-\fP is used. -.PP -To match a particular instance name, specify an instance name -explicitly after the class name, or use the normal Xt toolkit option. -For example, -.sp 1 -.in +.5i -.nf -% appres XTerm myxterm -.fi -.in -.5i -or -.in +.5i -.nf -% appres XTerm \-name myxterm -.fi -.in -.5i -.PP -To list resources that match a subhierarchy of an application, specify -hierarchical class and instance names. The number of class and instance -components must be equal, and the instance name should not be -specified with a toolkit option. For example, -.sp 1 -.in +.5i -.nf -% appres Xman.TopLevelShell.Form xman.topBox.form -.fi -.in -.5i -.sp 1 -will list the resources of widgets of \fIxman\fP topBox hierarchy. -To list just the resources matching a specific level in the hierarchy, -use the \-1 option. For example, -.sp 1 -.in +.5i -.nf -% appres XTerm.VT100 xterm.vt100 \-1 -.fi -.in -.5i -.sp 1 -will list the resources matching the \fIxterm\fP vt100 widget. -.SH "SEE ALSO" -.PP -X(__miscmansuffix__), xrdb(1), listres(1) -.SH AUTHOR -Jim Fulton, MIT X Consortium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/autogen.sh new/appres-1.0.4/autogen.sh --- old/appres-1.0.3/autogen.sh 2009-10-16 23:37:59.000000000 +0200 +++ new/appres-1.0.4/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -$srcdir/configure --enable-maintainer-mode "$@" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/configure.ac new/appres-1.0.4/configure.ac --- old/appres-1.0.3/configure.ac 2010-10-31 19:50:51.000000000 +0100 +++ new/appres-1.0.4/configure.ac 2013-05-18 02:39:21.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([appres], [1.0.3], +AC_INIT([appres], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [appres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -39,6 +39,9 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(APPRES, x11 xt) +PKG_CHECK_MODULES(APPRES, [x11 xt xproto >= 7.0.17]) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/man/Makefile.am new/appres-1.0.4/man/Makefile.am --- old/appres-1.0.3/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/appres-1.0.4/man/Makefile.am 2013-05-18 02:39:21.000000000 +0200 @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = appres.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/man/appres.man new/appres-1.0.4/man/appres.man --- old/appres-1.0.3/man/appres.man 1970-01-01 01:00:00.000000000 +0100 +++ new/appres-1.0.4/man/appres.man 2013-05-18 02:39:21.000000000 +0200 @@ -0,0 +1,91 @@ +.\" Copyright 1993, 1994, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER 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 DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.TH APPRES 1 __xorgversion__ +.SH NAME +appres \- list X application resource database +.SH SYNOPSIS +.B "appres" +[class [instance]] [-1] [-V] [toolkitoptions] +.SH DESCRIPTION +.PP +The \fIappres\fP program prints the resources seen by an application +(or subhierarchy of an application) with the specified \fIclass\fP and +\fIinstance\fP names. It can be used to determine which +resources a particular program will load. For example, +.sp 1 +.in +.5i +.nf +% appres XTerm +.fi +.in -.5i +.sp 1 +will list the resources that any \fIxterm\fP program will load. +If no application class is specified, the class \fI-AppResTest-\fP is used. +.PP +To match a particular instance name, specify an instance name +explicitly after the class name, or use the normal Xt toolkit option. +For example, +.sp 1 +.in +.5i +.nf +% appres XTerm myxterm +.fi +.in -.5i +or +.in +.5i +.nf +% appres XTerm \-name myxterm +.fi +.in -.5i +.PP +To list resources that match a subhierarchy of an application, specify +hierarchical class and instance names. The number of class and instance +components must be equal, and the instance name should not be +specified with a toolkit option. For example, +.sp 1 +.in +.5i +.nf +% appres Xman.TopLevelShell.Form xman.topBox.form +.fi +.in -.5i +.sp 1 +will list the resources of widgets of \fIxman\fP topBox hierarchy. +To list just the resources matching a specific level in the hierarchy, +use the \-1 option. For example, +.sp 1 +.in +.5i +.nf +% appres XTerm.VT100 xterm.vt100 \-1 +.fi +.in -.5i +.sp 1 +will list the resources matching the \fIxterm\fP vt100 widget. +.PP +The -V option prints the appres command version and exits. +.SH "SEE ALSO" +.PP +X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) +.SH AUTHOR +Jim Fulton, MIT X Consortium diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/appres-1.0.3/missing new/appres-1.0.4/missing --- old/appres-1.0.3/missing 2010-10-31 19:51:19.000000000 +0100 +++ new/appres-1.0.4/missing 2013-05-18 02:39:30.000000000 +0200 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2009-04-28.21; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <[email protected]>, 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,69 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to <[email protected]>." exit $? @@ -100,272 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
