From 5cfb5bf2e7acf143f6a663573e133f6346ee0053 Mon Sep 17 00:00:00 2001 From: Mike Small Date: Thu, 28 Sep 2017 00:55:30 -0400 Subject: [PATCH] Preliminaries: renaming --- ChangeLog | 1097 +--------- ChangeLog.twm | 1092 ++++++++++ Makefile.in | 5 +- README | 28 +- README.twm | 30 + aclocal.m4 | 2527 ++++++++++++---------- configure | 94 +- configure.ac | 4 +- man/Makefile.am | 2 +- man/Makefile.in | 5 +- man/{twm.man => twmruined.man} | 108 +- src/Makefile.am | 18 +- src/Makefile.in | 37 +- src/deftwmrc.c | 2 +- src/{system.twmrc => system.twmruinedrc} | 4 +- src/twm.c | 2 +- 16 files changed, 2623 insertions(+), 2432 deletions(-) create mode 100644 ChangeLog.twm create mode 100644 README.twm rename man/{twm.man => twmruined.man} (94%) rename src/{system.twmrc => system.twmruinedrc} (93%) diff --git a/ChangeLog b/ChangeLog index 1e2fc60..923018e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,1092 +1,17 @@ -commit b52e4041054b580bace70d9db5e7e3d90b33ad6d -Author: Alan Coopersmith -Date: Thu Apr 16 22:36:31 2015 -0700 +2017-09-27 Michael Small - twm 1.0.9 - - Signed-off-by: Alan Coopersmith + Preliminaries: -commit 8f68d82c5f6cff9b22dc3335f956453679b207ad -Author: Alan Coopersmith -Date: Wed Dec 31 09:50:11 2014 -0800 + * README: description of fork + * ChangeLog.twm: preserve twm's change log at 1.0.9 / 2015-04-16 + * README.twm: and original README + * configure.ac: new name, version, and url + * src/Makefile.am: new name + * src/system.twmruinedrc: new name + * src/twm.c: new name in one comment + * man/Makefile.am: new name + * man/twm.man: new name - Remove custom version of system(3c) for Solaris - - Was originally added in 1993 with the comment: - make f.exec do the right thing to get working xterms under Solaris2. - - Doesn't seem to be needed any more on modern Solaris. - As a bonus, gets rid of error found by Oracle Parfait 1.5.1 that - if the execl() call fails, the function falls through and returns - an uninitialized value for status and then both parent & child - go back to running the same code. - - Signed-off-by: Alan Coopersmith -commit 032fc6a734516189e11b43e0b4680d15b62c5e66 -Author: Alan Coopersmith -Date: Wed Dec 31 00:49:34 2014 -0800 - Only use results from GetWindowProperty if it returned success - - Since Xlib prior to 1.6 didn't always clear values on failure, don't - assume they're safe to use unless we succeeded. - - Reported by Oracle Parfait 1.5.1: - Error: Uninitialised memory (CWE 456) - Possible access to uninitialised memory '&nPixels' - at line 963 of src/parse.c in function 'put_pixel_on_root'. - &nPixels allocated at line 953. - Possible access to uninitialised memory '&retProp' - at line 962 of src/parse.c in function 'put_pixel_on_root'. - &retProp allocated at line 954. - - Signed-off-by: Alan Coopersmith -commit 76f6ad6e96b1ce62a32767bc0478a17b8b9204d7 -Author: Laurent Carlier -Date: Mon Aug 4 16:39:24 2014 +0200 - - Update manpage with the proper location of system.twmrc file - - Signed-off-by: Laurent Carlier - Reviewed-by: Alan Coopersmith - Signed-off-by: Alan Coopersmith - -commit 0cb43e864b2e9972630556e98caa24abf8928122 -Author: Alan Coopersmith -Date: Mon Jun 2 22:06:21 2014 -0700 - - autogen.sh: Honor NOCONFIGURE=1 - - See http://people.gnome.org/~walters/docs/build-api.txt - - Signed-off-by: Alan Coopersmith - -commit c33c83fb83be7f6402b615b4b32b5dc2036b951d -Author: Alan Coopersmith -Date: Mon Jun 2 22:06:21 2014 -0700 - - configure: Drop AM_MAINTAINER_MODE - - Signed-off-by: Alan Coopersmith - -commit 9c09c3e3577460fcef44e7abe51d22fcbda10ea8 -Author: Gaetan Nadon -Date: Fri Oct 25 21:51:37 2013 -0400 - - config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES - - Fix Automake warning: AC_OUTPUT should be used without arguments. - www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files - - Signed-off-by: Gaetan Nadon - -commit 46c4255ba661145df429d9dc190355a9661da3c1 -Author: Alan Coopersmith -Date: Fri Sep 6 18:59:24 2013 -0700 - - twm 1.0.8 - - Signed-off-by: Alan Coopersmith - -commit 97b55a970dc5281c2d41500990d99fcd24d2dd5f -Author: Alan Coopersmith -Date: Sun Aug 18 10:50:01 2013 -0700 - - Replace malloc(strlen()+1); strcpy(); pairs with strdup() - - Signed-off-by: Alan Coopersmith - -commit 8b2a314c267071656ca4d86bae56c6d82bb8127a -Author: Alan Coopersmith -Date: Sun Aug 18 10:42:45 2013 -0700 - - AddWindow: Use NULL instead of 0 for null pointer check - - Signed-off-by: Alan Coopersmith - -commit c2e232e6915356eba3edf2efea99720746694c52 -Author: Alan Coopersmith -Date: Sun Aug 18 10:28:21 2013 -0700 - - Stop casting return values from malloc & calloc - - Signed-off-by: Alan Coopersmith - -commit 58f3c3b8d518786764f45ac2be1f1f0850129125 -Author: Alan Coopersmith -Date: Sun Aug 18 10:18:21 2013 -0700 - - Stop casting pointers to (char *) when freeing them - - Signed-off-by: Alan Coopersmith - -commit 2a637337713c5c92c44249b88e31696ce9efdf9b -Author: Alan Coopersmith -Date: Wed Jul 31 23:28:42 2013 -0700 - - Delete trailing whitespace in non *.[ch] source files - - Signed-off-by: Alan Coopersmith - -commit ce4e11143f982234be1076e384b31228f1cc84ae -Author: Alan Coopersmith -Date: Wed Jul 31 22:54:01 2013 -0700 - - Make more functions static that aren't called from other files - - Signed-off-by: Alan Coopersmith - -commit 8a3d3a58350506a99efd24f9856466a99bbb9c51 -Author: Alan Coopersmith -Date: Wed Jul 31 22:28:11 2013 -0700 - - Assume C89 signal handlers, returning void - - Removes old #ifdef SIGNALRETURNSINT check that was never defined in - autoconf builds, only old Imake builds. - - Signed-off-by: Alan Coopersmith - -commit afcad0de54ecd1a8bfaf261e4e6882985a234963 -Author: Alan Coopersmith -Date: Wed Jul 31 22:24:22 2013 -0700 - - Make some more previously global variables into file-scoped statics - - Not used from other source files, so no need to export them - - Signed-off-by: Alan Coopersmith - -commit 4c2ff3f0a6bae8b369dfb74267f7fa52d511dfb2 -Author: Alan Coopersmith -Date: Wed Jul 31 22:21:00 2013 -0700 - - Remove unused global variable gotFirstSave - - Signed-off-by: Alan Coopersmith - -commit ca038999b5c1387f3aa19baeafc81a27563631b1 -Author: Alan Coopersmith -Date: Wed Jul 31 22:04:39 2013 -0700 - - unifdef macII - drop support for A/UX 2.0 - - Signed-off-by: Alan Coopersmith - -commit 55681f9d66b788b2e86a5ad3c0722904fa020962 -Author: Alan Coopersmith -Date: Tue Jul 30 22:15:28 2013 -0700 - - Make various helper & callback functions private to session.c - - Nothing else ever called them, so no reason to export them. - - Signed-off-by: Alan Coopersmith - Reviewed-by: - -commit cf88a8c16958ddfaeff6349d30c6c423fc4a7afa -Author: Alan Coopersmith -Date: Tue Jul 30 22:11:51 2013 -0700 - - Convert remaining K&R function declarations to C89 style - - Many existing function declarations were C89, and headers all use C89 - prototypes, but a few function declarations had been left in the old - style. - - Signed-off-by: Alan Coopersmith - Reviewed-by: - -commit ea349d3c406695665322c71caf5ea3c970cb3155 -Author: Alan Coopersmith -Date: Tue Jul 30 21:57:04 2013 -0700 - - Use (void) to declare functions that take no arguments, instead of () - - It's time for C89. - - Signed-off-by: Alan Coopersmith - Reviewed-by: - -commit abb8b6198b639359f34ab6f0ab97039016d8b6db -Author: Colin Harrison -Date: Fri Jul 19 00:48:09 2013 +0100 - - Syntax error in recent twm commit - - twm needs a typo/syntax correction following a recent commit. - - Signed-off-by: Alan Coopersmith - -commit e84f2e87222879ca667c1fb3d1cb3236a1159d12 -Author: Alan Coopersmith -Date: Thu Jul 18 00:24:30 2013 -0700 - - Constification cleanup - fix dozens of gcc warnings - - Signed-off-by: Alan Coopersmith - -commit b16ce9773e4da5897ab546de85e48a3ea58d0e00 -Author: Eric S. Raymond -Date: Wed Jun 19 05:39:10 2013 -0400 - - Don't rely on the ability to set tab stops. - -commit 07ed63f865f6fef4c14711063534b73eb33e0cdb -Author: Egbert Eich -Date: Thu May 19 11:08:21 2011 +0200 - - Fix SEGV if CreateColormapWindow() returns NULL. - - twm can segfault when it cannot collect attribute information on - a window that has been destroyed before it got a chance to collect - it's attributes. - twm seems to assume that it is always able to collect this information - and disregards the error if the function that attempts to collect it - fails and CreateColormapWindow() returns NULL. - If this happens correct number_cmap_windows to prevent a SEGV later - on due to an incorrect setting. - - Signed-off-by: Egbert Eich - -commit b62e91790d1f07f729d4221c878a0847ff14ad82 -Author: Alan Coopersmith -Date: Sat Nov 19 11:38:33 2011 -0800 - - Terminate execl() arguments with NULL instead of 0 - - Makes sure that a full 64-bits of 0 is passed in 64-bit builds, and - clears gcc warning of: - - menus.c: In function ‘System’: - menus.c:2344:2: warning: missing sentinel in function call - - Signed-off-by: Alan Coopersmith - -commit 4c5e72e9d8571bfb2a98d1ffc9724596764f5b0b -Author: Alan Coopersmith -Date: Wed Jul 27 20:33:13 2011 -0700 - - twm 1.0.7 - - Signed-off-by: Alan Coopersmith - -commit f21823506dcb956d62c260e6e207f1dc2ce7732a -Author: Alan Coopersmith -Date: Thu Jul 14 22:04:34 2011 -0700 - - Whitespace fixes in src files - - Signed-off-by: Alan Coopersmith - -commit c6ade914363426facb01a954650b804657114012 -Author: Alan Coopersmith -Date: Tue Jul 12 22:30:41 2011 -0700 - - Replace most sprintf calls with snprintf - - Signed-off-by: Alan Coopersmith - -commit ab689e1a711bbbdfcd6d3a8d2edebbc378ebccb7 -Author: Gaetan Nadon -Date: Mon Mar 7 20:05:45 2011 -0500 - - config: layout the C flags for better readability - - Group pre-processor flags under AM_CPPFLAGS - Might as well do the rest of the file. - - Signed-off-by: Gaetan Nadon - -commit f048770b021d92780c754257c9c1efa7a769c69c -Author: Gaetan Nadon -Date: Mon Mar 7 19:47:48 2011 -0500 - - man: use Autoconf provided $(SED) - - Use platform appropriate version of sed. - - Signed-off-by: Gaetan Nadon - -commit 356ca1db47be674aa9125b65668e8fe0573f7f69 -Author: Gaetan Nadon -Date: Mon Mar 7 19:37:48 2011 -0500 - - config: rm is about removal, not generation - - Automake: - AM_V_at as a prefix to commands that should not output anything in silent mode - - Signed-off-by: Gaetan Nadon - -commit 6f362f8d962ff7054682cfb2d88e8603e1219492 -Author: Gaetan Nadon -Date: Mon Mar 7 16:43:59 2011 -0500 - - deftwmrc.c is not required in MAINTAINERCLEANFILES - - Automake takes care of that as it is part of BUILT_SOURCES - - Signed-off-by: Gaetan Nadon - -commit 98e224e3da245f29d281df357d27b53acdccb5c7 -Author: Gaetan Nadon -Date: Mon Mar 7 16:10:53 2011 -0500 - - lex & yacc: only header file needs to be in BUILT_SOURCES - - http://www.gnu.org/software/automake/manual/automake.html#Yacc-and-Lex - - This completes reversal of commit ea03b6bcd1045dfc0d6947e4858de8994d61170b - The Makefile generates a valid "gram.h: gram.c" rule. - The Makefile already has gram.c gram.h and lex.c in the - maintainer-clean-generic target. - - Signed-off-by: Gaetan Nadon - -commit 70a7f34dfc4d7ea4f7425b9a7359a08a35752bb0 -Author: Jeremy Huddleston -Date: Wed May 11 22:41:56 2011 -0700 - - Add extra sanity checking to avoid possible NULL dereferences - - menus.c:569:10: warning: Access to field 'func' results in a dereference of a null pointer (loaded from variable 'ActiveItem') - if (ActiveItem->func != F_TITLE && !ActiveItem->state) - ^~~~~~~~~~ - - Found-by: clang static analyzer - Signed-off-by: Jeremy Huddleston - Acked-by: Peter Hutterer - -commit a898b136729660a33d60b317ccb839f6e0428201 -Author: Jeremy Huddleston -Date: Wed May 11 22:30:56 2011 -0700 - - Add sanity checking to avoid a possible NULL dereference - - menus.c:934:26: warning: Access to field 'fore' results in a dereference of a null pointer (loaded from variable 'cur') - cur->hi_back = cur->fore = f3.pixel; - ~~~ ^ - - Found-by: clang static analyzer - Signed-off-by: Jeremy Huddleston - Acked-by: Peter Hutterer - -commit 1061e063be78f4e233d550649ce297b639193a9f -Author: Jeremy Huddleston -Date: Wed May 11 22:27:21 2011 -0700 - - Address a possible NULL pointer dereference - - menus.c:523:24: warning: Access to field 'w' results in a dereference of a null pointer (loaded from variable 'ActiveMenu') - if (XFindContext(dpy, ActiveMenu->w, ScreenContext, &context_data) == 0) - ^~~~~~~~~~ - - Found-by: clang static analyzer - Signed-off-by: Jeremy Huddleston - Acked-by: Peter Hutterer - -commit bde0b06b465adb868d38d3721b95ea337bad8eb9 -Author: Jeremy Huddleston -Date: Wed May 11 22:22:25 2011 -0700 - - Mark Done() as _X_NORETURN - - list.c:103:11: warning: Access to field 'next' results in a dereference of a null pointer (loaded from variable 'nptr') - nptr->next = *list_head; - ~~~~ ^ - - Found-by: clang static analyzer - Signed-off-by: Jeremy Huddleston - -commit 2f5d1e29f5a803ba2417d6fe20782c05ed932612 -Author: Jeremy Huddleston -Date: Wed May 11 22:17:54 2011 -0700 - - Silence uninitialized warning - - session.c: In function 'ReadWinConfigFile': - session.c:554: warning: 'version' may be used uninitialized in this function - - Signed-off-by: Jeremy Huddleston - -commit ef39179b9fe6d13f7e81098edfc10711c8b40948 -Author: Jeremy Huddleston -Date: Wed May 11 22:16:23 2011 -0700 - - LP64: Fix formatting for DEBUG printf - - add_window.c: In function 'AddWindow': - add_window.c:169: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'Window' - - Signed-off-by: Jeremy Huddleston - -commit 0f1ccd0b3409ab9b9fce1256fc59ad9bbe69a349 -Author: Alan Coopersmith -Date: Tue May 10 15:35:51 2011 -0700 - - Fix: menus.c:2374: warning: implicit declaration of function `putenv` - - Ensure _GNU_SOURCE is defined on Linux builds before including - so the prototype is exposed in the header properly. - - https://bugs.freedesktop.org/show_bug.cgi?id=32696 - - Signed-off-by: Alan Coopersmith - Reviewed-by: Julien Cristau - -commit 75dd868133c5c12daa946468e7250d174f842281 -Author: Alan Coopersmith -Date: Mon May 9 22:46:03 2011 -0700 - - Remove unused fallback implementation of putenv() - - NOPUTENV was never defined in a modular build, probably because putenv() - is a standard function in Unix98 / SUSv2, and goes back to at least - SVR2 and 4.3BSD-Reno. - - Signed-off-by: Alan Coopersmith - Reviewed-by: Matthieu Herrb - Reviewed-by: Mark Kettenis - -commit 5b763259451b7798b1004c49775d1bd3df2f9d88 -Author: Gaetan Nadon -Date: Fri Mar 4 20:57:30 2011 -0500 - - man: replace hard coded section number with __appmansuffix__ - - Signed-off-by: Gaetan Nadon - -commit 611f20e896aa533f0f3e5cd6c8fdd7c381963c95 -Author: Alan Coopersmith -Date: Wed Jan 5 16:12:42 2011 -0800 - - Fix many gcc strict-aliasing warnings - - menus.c:518: warning: dereferencing type-punned pointer will break strict-aliasing rules - - and many more of the same message at different lines - - Signed-off-by: Alan Coopersmith - -commit b160f7bcb99111e631d6701b199f1dad1e40c80d -Author: Alan Coopersmith -Date: Wed Jan 5 14:09:15 2011 -0800 - - twm 1.0.6 - - Signed-off-by: Alan Coopersmith - -commit 1347a210cafa75db40198f8f9e3ca36f8e627bf6 -Author: Alan Coopersmith -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 - -commit 1ca7092e44e87038ba95a962a3c952ef72b4f146 -Author: Martin Jansa -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 - -commit b3af92c7bca31b3bf73428d46291b88c3f86026e -Author: Alan Coopersmith -Date: Sat Oct 30 15:03:50 2010 -0700 - - twm 1.0.5 - - Signed-off-by: Alan Coopersmith - -commit 7f164a9631e4ec26657bedeb947409d0b484e967 -Author: Alan Coopersmith -Date: Sat Oct 30 15:01:43 2010 -0700 - - Sun's copyrights now belong to Oracle - - Signed-off-by: Alan Coopersmith - -commit 357d089016bd889f2f73349c3f977c6adccc85a6 -Author: Jesse Adkins -Date: Tue Sep 28 13:29:49 2010 -0700 - - Purge cvs tags. - - Signed-off-by: Jesse Adkins - -commit 4c7c2ece9e152358448406b759c30eb44eea13f9 -Author: Alan Coopersmith -Date: Thu Sep 23 00:11:56 2010 -0700 - - config: upgrade to util-macros 1.8 for additional man page support - - Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS - The value of MAN_SUBST is the same for all X.Org packages. - - Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS - The existing statement can now be removed from the configuration file. - - Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) - Enables silent rule and use platform appropriate version of sed. - - Signed-off-by: Alan Coopersmith - -commit 3bcc18ca9968a33dbf3e8df920f08227f95d8a72 -Author: Alan Coopersmith -Date: Wed Sep 22 23:59:32 2010 -0700 - - Silence build of deftwmrc.c with AM_V_GEN - - Signed-off-by: Alan Coopersmith - -commit 282060f633c1a0910522f64cf36222a27016bf77 -Author: Alan Coopersmith -Date: Wed Sep 22 23:37:21 2010 -0700 - - system.twmrc doesn't need to be in both EXTRA_DIST & dist_rc_DATA - - Signed-off-by: Alan Coopersmith - -commit 810922b19b86c1ddd5ef9c9169d1328b3562af77 -Author: Alan Coopersmith -Date: Wed Sep 22 23:33:22 2010 -0700 - - config: Remove unnecessary calls from configure.ac - - AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now - PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables - - Signed-off-by: Alan Coopersmith - -commit 79e3387e7a2d35f5895f813a4572a93457114e3c -Author: Alan Coopersmith -Date: Wed Sep 22 23:23:26 2010 -0700 - - Use AC_CHECK_FUNCS / default name for mkstemp - - No longer need to maintain #ifdef compatibility with the names used in - the monolith Imakefiles. - - Signed-off-by: Alan Coopersmith - -commit 3bac463f63b4c1e667256c7d2d287b3567a7ff1c -Author: Gaetan Nadon -Date: Tue Jul 20 18:45:18 2010 -0400 - - config: update AC_PREREQ statement to 2.60 - - Unrelated to the previous patches, the new value simply reflects - the reality that the minimum level for autoconf to configure - all x.org modules is 2.60 dated June 2006. - - ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz - - Signed-off-by: Gaetan Nadon - -commit 40480fdbe6c15076a2e734cae246c62c85862829 -Author: Alan Coopersmith -Date: Fri Aug 6 08:27:35 2010 -0700 - - Fill in COPYING file with copyright notices from source code - - Signed-off-by: Alan Coopersmith - -commit a9f315f32bcc0636ada7427be9e3c5e3810af05e -Author: Gaetan Nadon -Date: Sat Jul 17 16:36:41 2010 -0400 - - config: allow to build tarball when yacc is missing - - Autoconf does not handle this scenario as well as Automake does. - If gram.c is already there, do not abort the configuration - if yacc is missing as it is not needed. - - If both gram.c and yacc are missing, abort configuration. - Yacc is a required tool to build the package. - - Signed-off-by: Gaetan Nadon - -commit 29a157f7f181ac02c88537032dbcca29880c3068 -Author: Gaetan Nadon -Date: Fri Jun 4 17:09:18 2010 -0400 - - config: add check for yacc to insure it is installed #27973 - - Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" - as a last resort, even if no programs have been found. Improve error - checking by issuing an error message if yacc is not found. The module - cannot build anyway. - - Signed-off-by: Gaetan Nadon - -commit d0da74f035fd3595b5ddfb6ded29bdc5f9666ceb -Author: Alan Coopersmith -Date: Thu Jan 14 21:40:48 2010 -0800 - - Update Sun license notices to current X.Org standard form - - Signed-off-by: Alan Coopersmith - -commit 9adc93df944e203726d09716dc3bfbbc6cf304ae -Author: Gaetan Nadon -Date: Thu Nov 26 09:19:52 2009 -0500 - - Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES - - Now that the INSTALL file is generated. - Allows running make maintainer-clean. - -commit 2386d631c301233899bdcc6381203bcbd1139ab3 -Author: Gaetan Nadon -Date: Wed Oct 28 14:09:08 2009 -0400 - - INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 - - Add missing INSTALL file. Use standard GNU file on building tarball - README may have been updated - Remove AUTHORS file as it is empty and no content available yet. - Remove NEWS file as it is empty and no content available yet. - -commit 7f4c2b588bc94702eb0df0618a97413b0e544879 -Author: Gaetan Nadon -Date: Tue Oct 27 15:07:24 2009 -0400 - - Deploy the new XORG_DEFAULT_OPTIONS #24242 - - This macro aggregate a number of existing macros that sets commmon - X.Org components configuration options. It shields the configuration file from - future changes. - -commit 5c13f89a73f7b57dad9c9dcfd63e084077550c3e -Author: Gaetan Nadon -Date: Mon Oct 26 22:08:38 2009 -0400 - - Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 - - ChangeLog filename is known to Automake and requires no further - coding in the makefile. - -commit 3d6678095a3553b9ab36d60e6a254acfbdc831c1 -Author: Gaetan Nadon -Date: Thu Oct 22 16:25:53 2009 -0400 - - .gitignore: use common defaults with custom section # 24239 - - Using common defaults will reduce errors and maintenance. - Only the very small or inexistent custom section need periodic maintenance - when the structure of the component changes. Do not edit defaults. - -commit a3f6e3cbd99b6394c3dc70d54f07f129b4ece70c -Author: Jeremy Huddleston -Date: Wed Oct 21 12:47:20 2009 -0700 - - This is not a GNU project, so declare it foreign. - - On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: - > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: - > > I noticed an INSTALL file in xlsclients and libXvMC today, and it - > > was quite annoying to work around since 'autoreconf -fvi' replaces - > > it and git wants to commit it. Should these files even be in git? - > > Can I nuke them for the betterment of humanity and since they get - > > created by autoreconf anyways? - > - > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 - - As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with - AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation - of the INSTALL file. It is also part of the 24206 solution. - - Signed-off-by: Jeremy Huddleston - -commit 06d15a482a596f1d846b97627badd28381c2e7b2 -Author: Alan Coopersmith -Date: Thu Oct 1 14:54:20 2009 -0700 - - Add README with pointers to mailing lists, bugzilla, & git - - Signed-off-by: Alan Coopersmith - -commit 4d9e3200b1625ad24053ce5f1ca816a03939c6d5 -Author: Gaetan Nadon -Date: Tue Jul 7 17:32:01 2009 -0400 - - twm: use XORG_CHANGELOG macro to create ChangeLog. #22611 - - Build break: app/twm/Makefile.am: command not found: git-log - Adding the macro in configure.ac and use it in Makefile.am - Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 - Tested: running autogen.sh, make and 'make dist' - - Signed-off-by: Gaetan Nadon - Signed-off-by: Peter Hutterer - -commit 1fa03c39bddace4d787c55703f3081bcaf36511b -Author: Adam Jackson -Date: Thu Mar 6 16:52:54 2008 -0500 - - twm 1.0.4 - -commit d28dffd63bd5070445b15d1b9b70f3303ec5e333 -Author: Alan Coopersmith -Date: Thu Feb 21 08:16:39 2008 -0800 - - Change twm_CFLAGS to AM_CFLAGS to make automake-1.10 happier - - src/Makefile.am:35: compiling `add_window.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac' - -commit ca9494bf50c9314597f4e88efa5bf5d66c1cd38f -Author: Alan Coopersmith -Date: Thu Feb 21 08:14:01 2008 -0800 - - Explicitly require libSM & libICE since twm calls them directly - -commit f0543e7ff17f6e8aefbd6cc003d0679a706a8535 -Author: James Cloos -Date: Thu Dec 6 16:37:07 2007 -0500 - - Replace static ChangeLog with dist-hook to generate from git log - -commit 44d51a2bc7d1e2fc5fcd3f729b6f0ca6e62e1f00 -Author: Wolfgang Rupprecht -Date: Mon Jan 23 15:11:00 2006 -0800 - - X.Org Bug #5691: twm mouse button limit too low - - - -commit 03a4e6c35161402d1477acb95723ab93eabde97e -Author: James Cloos -Date: Mon Sep 3 05:51:13 2007 -0400 - - Add *~ to .gitignore to skip patch/emacs droppings - -commit 9ae787c9f0d02aeb4c67fd20cee08d3cccd99fb4 -Author: James Cloos -Date: Thu Aug 23 19:24:38 2007 -0400 - - Rename .cvsignore to .gitignore - -commit 5f70aaffa0fa88a4b08ea40cfdbde5f34d20d366 -Author: Daniel Stone -Date: Thu Nov 30 19:56:29 2006 +0200 - - bump to 1.0.3 - -commit f27c4a577f68673e5022db1a4db79da9a3d05502 -Author: Matthieu Herrb -Date: Tue Nov 28 13:24:08 2006 +0000 - - Fix system.twmrc handling - -commit 6736d9094d2719f21e3ba0050aad88f3ffc78dc4 -Author: Adam Jackson -Date: Fri Oct 13 17:47:24 2006 -0400 - - Bump to 1.0.2 - -commit 4bc5a25c21006e547ff7fce7fff7544acbb22174 -Author: Alan Coopersmith -Date: Sat Jun 3 07:06:42 2006 +0000 - - Coverity #369: If malloc of entry->wm_command fails, error cleanup was - still trying to read pointers from it to free. - -commit 9680fbed52e3af20d226040958f91502b6027d2d -Author: Alan Coopersmith -Date: Sat Jun 3 06:54:20 2006 +0000 - - Coverity #1508: Variable "action" not freed or pointed-to - -commit ab7a497d995347e340c28c4eb0d1f0f9ee298e41 -Author: Kevin E Martin -Date: Wed Dec 21 02:29:47 2005 +0000 - - Update package version for X11R7 release. - -commit 4bd96f2d5d976dbd17bac563504985a1bc793ffe -Author: Adam Jackson -Date: Mon Dec 19 16:22:41 2005 +0000 - - Stub COPYING files - -commit 2c1cd456efe91302b0de645ea36a84c49472f104 -Author: Kevin E Martin -Date: Thu Dec 15 00:24:04 2005 +0000 - - Update package version number for final X11R7 release candidate. - -commit 9f88f7db68e146c1d1b60a988f68f1528350a9a8 -Author: Kevin E Martin -Date: Tue Dec 6 22:48:19 2005 +0000 - - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -commit 466a35f33d48427d7f5a186cf60fddd070ce2d71 -Author: Kevin E Martin -Date: Sat Dec 3 05:49:17 2005 +0000 - - Update package version number for X11R7 RC3 release. - -commit 81d2d1208b1445f60e10186b61e472b22ac47712 -Author: Alan Coopersmith -Date: Mon Nov 28 22:01:39 2005 +0000 - - Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 - update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) - -commit 6897ce2b13a0b651c8bb56b833e51125d678ea81 -Author: Eric Anholt -Date: Mon Nov 21 10:34:58 2005 +0000 - - Another pass at .cvsignores for apps. - -commit 3cf0d5d098a049e1113dad20699b07d1a91fd9ca -Author: Eric Anholt -Date: Sun Nov 20 22:08:50 2005 +0000 - - Add/improve .cvsignore files for apps. - -commit d99f0e0b2577cbdfea2a51d8ca20aff080539b60 -Author: Kevin E Martin -Date: Sat Nov 19 07:15:36 2005 +0000 - - Update pkgconfig files to separate library build-time dependencies from - application build-time dependencies, and update package deps to work - with separate build roots. - -commit 6dfc0dee6645c7620cc2fb9a5d44b041cb6558b6 -Author: Kevin E Martin -Date: Wed Oct 19 02:47:50 2005 +0000 - - Update package version number for RC1 release. - -commit 43fb7218e8723f6f3321ec406745971ca5fd0d00 -Author: Alan Coopersmith -Date: Mon Oct 17 23:56:21 2005 +0000 - - Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to - work better with BSD make - -commit a85acab665c375d14ae15ef90f6baf8b47c7032b -Author: Alan Coopersmith -Date: Sun Oct 16 22:32:51 2005 +0000 - - Capitalize O in "X.Org Foundation" - Use cpp to substitute variables in man pages - -commit a3bbaecf0502d58cf0bc7ff7db99e9239c6e822c -Author: Kevin E Martin -Date: Sat Oct 15 19:19:03 2005 +0000 - - Have generated files be cleaned by maintainer to pass check-tarball test. - -commit 7ccfcb8e4f4caabba7c26de42ce2db252b5b0817 -Author: Alan Coopersmith -Date: Sun Oct 9 19:11:53 2005 +0000 - - Bug #3755 twm can't - handle 8-bit characters in .twmrc (Tomohiro KUBOITA) - -commit b098cf784d34421de0ae51d8cd7090022d3b2600 -Author: Alan Coopersmith -Date: Sun Oct 9 19:10:58 2005 +0000 - - Bug #3755 twm can't - handle 8-bit characters in .twmrc (Tomohiro KUBOITA) - -commit e2c423a32d8ba724e19e6db5b315ef9011d89488 -Author: Alan Coopersmith -Date: Sun Oct 9 18:59:28 2005 +0000 - - Bug #3755 twm can't - handle 8-bit characters in .twmrc (Tomohiro KUBOITA) - -commit ea03b6bcd1045dfc0d6947e4858de8994d61170b -Author: Keith Packard -Date: Tue Aug 2 18:08:48 2005 +0000 - - Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are - regenerated after 'make clean' and to make parallel builds work right. - -commit a12f281be43c1c86147fb89c99484ac558f64425 -Author: Alan Coopersmith -Date: Mon Aug 1 20:25:28 2005 +0000 - - Install man pages to section 1 instead of section m (Patch from Donnie - Berkholz) - -commit 99c2e9865374605697c2a85099bbc56bf7853969 -Author: Alan Coopersmith -Date: Sat Jul 30 21:07:26 2005 +0000 - - Add prototypes of Xalloc/free functions. - Export ImUtil.h to match modular tree install. - Define SVR4 to 1 to avoid warning about redefining to different values. - Include missing headers to clear more compiler warnings. - -commit 5bf9409bc3c7e11d86bcd5b25760435e199b85c5 -Author: Kevin E Martin -Date: Fri Jul 29 21:22:30 2005 +0000 - - Various changes preparing packages for RC0: - - Verify and update package version numbers as needed - - Implement versioning scheme - - Change bug address to point to bugzilla bug entry form - - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to - reenable it) - - Fix makedepend to use pkgconfig and pass distcheck - - Update build script to build macros first - - Update modular Xorg version - -commit b2de9b16ae9b7bfce8e7cc36f20a38084fa25469 -Author: Adam Jackson -Date: Wed Jul 20 19:31:51 2005 +0000 - - Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global - configure cache, you cache it, and the cached value is probably wrong. - -commit c0570ffdfa9ef913b5132b2069dd69491f77a8f8 -Author: Matthieu Herrb -Date: Sun Jul 17 20:11:01 2005 +0000 - - fix rules to work with non-GNU make and outside of $srcdir - -commit 29fba3a480ab1b4168d75ed92c8150851dddd805 -Author: Alan Coopersmith -Date: Sat Jul 16 22:07:13 2005 +0000 - - Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get - HAS_MKSTEMP defined in modular builds. - -commit 63e81296232ec5fdd6529a7d5d4342186bbec2f8 -Author: Alan Coopersmith -Date: Sat Jul 16 21:59:14 2005 +0000 - - Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection - against tempfile race conditions in many places) - -commit 2e6a393e7b0f02e8f58a3005411ae22488965e28 -Author: Søren Sandmann Pedersen -Date: Thu Jul 14 22:36:06 2005 +0000 - - Add _BSD_SOURCE - patch from Stefan Dirsch - -commit 300a4fcbfaef76f78dbb98c9868fa85da1604ccf -Author: Søren Sandmann Pedersen -Date: Thu Jul 14 22:35:37 2005 +0000 - - Add makefile that CVS ate - patch from Stefan Dirsch - -commit 1cb0150431562d729342c427129732b217526bab -Author: Daniel Stone -Date: Mon Jul 11 22:51:03 2005 +0000 - - Bug #3754: Fix window misplacement in twm. (Christopher Mario Mae) - -commit 682eaa7cd21e32f70d909aae7d4828c9f4ea9dd1 -Author: Søren Sandmann Pedersen -Date: Wed Jun 29 19:15:03 2005 +0000 - - Add buildsystem for twm - -commit 718daab22b08a1ab10145f9284dedef069ffb758 -Author: Roland Mainz -Date: Fri Mar 11 21:18:12 2005 +0000 - - xc/programs/twm/Imakefile - xc/programs/twm/twm.c - //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2087 - (https://bugs.freedesktop.org/attachment.cgi?id=2087) Make twm ignore - print screens to avoid that users accidentally warp on a non-video - screen (which are not visible on any monitor) when the Xserver has both - video and print screens. (This includes also a small cleanup of - xdpyinfo where parts of the print screen test code comes from) Patch by - Julien Lafon (MIT/X.org license). - -commit 6e96bd376c916c150a055447d4badc1fae84e47a -Author: Roland Mainz -Date: Fri Mar 11 16:23:00 2005 +0000 - - xc/programs/twm/add_window.c - xc/programs/twm/cursor.c - xc/programs/twm/events.c - xc/programs/twm/gc.c - xc/programs/twm/gram.y - xc/programs/twm/iconmgr.c - xc/programs/twm/icons.c - xc/programs/twm/list.c - xc/programs/twm/menus.c - xc/programs/twm/parse.c - xc/programs/twm/resize.c - xc/programs/twm/twm.c - //bugs.freedesktop.org/show_bug.cgi?id=2566) attachment #2083 - (https://bugs.freedesktop.org/attachment.cgi?id=2083) ANSI-fy twm - window manager code. The conversion preserves the comments which - annotate variables and function arguments (these have been moved into - doxygen(esque?) "stubs" above each function. Patch by Mike Owens - . - -commit d045cb62c62f09978798510deaec0acae0a6fb4d -Author: Egbert Eich -Date: Fri Apr 23 19:54:37 2004 +0000 - - Merging XORG-CURRENT into trunk - -commit f39f4c810b3c2071f8786abc32317149373a3e1d -Author: Egbert Eich -Date: Sun Mar 14 08:34:58 2004 +0000 - - Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 - -commit 58d942b4a0b4ed9b99a4dd6501bf4facbcaca670 -Author: Egbert Eich -Date: Wed Mar 3 12:12:54 2004 +0000 - - Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 - -commit ee477f9d9c4aff3f52d9a65e3b11b55dd15b31d1 -Author: Egbert Eich -Date: Thu Feb 26 13:36:16 2004 +0000 - - readding XFree86's cvs IDs - -commit e8c79f538be77c2637e8d2e1ada443d9a2f0e262 -Author: Egbert Eich -Date: Thu Feb 26 09:23:58 2004 +0000 - - Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 - -commit e51f25fbe75b222b24f4628b2408e899fa4748d7 -Author: Kaleb Keithley -Date: Tue Nov 25 19:29:03 2003 +0000 - - XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks - -commit 4b339f0a4311b4db171584bc6671292a9052665a -Author: Kaleb Keithley -Date: Fri Nov 14 16:48:58 2003 +0000 - - XFree86 4.3.0.1 - -commit cfa9fa24253b5ef8045172852509be413d7b00ca -Author: Kaleb Keithley -Date: Fri Nov 14 16:48:58 2003 +0000 - - Initial revision - -commit 03cb750f7935722ab77b77128ca5221c5baf8818 -Author: Kaleb Keithley -Date: Fri Nov 14 15:54:53 2003 +0000 - - R6.6 is the Xorg base-line diff --git a/ChangeLog.twm b/ChangeLog.twm new file mode 100644 index 0000000..1e2fc60 --- /dev/null +++ b/ChangeLog.twm @@ -0,0 +1,1092 @@ +commit b52e4041054b580bace70d9db5e7e3d90b33ad6d +Author: Alan Coopersmith +Date: Thu Apr 16 22:36:31 2015 -0700 + + twm 1.0.9 + + Signed-off-by: Alan Coopersmith + +commit 8f68d82c5f6cff9b22dc3335f956453679b207ad +Author: Alan Coopersmith +Date: Wed Dec 31 09:50:11 2014 -0800 + + Remove custom version of system(3c) for Solaris + + Was originally added in 1993 with the comment: + make f.exec do the right thing to get working xterms under Solaris2. + + Doesn't seem to be needed any more on modern Solaris. + As a bonus, gets rid of error found by Oracle Parfait 1.5.1 that + if the execl() call fails, the function falls through and returns + an uninitialized value for status and then both parent & child + go back to running the same code. + + Signed-off-by: Alan Coopersmith + +commit 032fc6a734516189e11b43e0b4680d15b62c5e66 +Author: Alan Coopersmith +Date: Wed Dec 31 00:49:34 2014 -0800 + + Only use results from GetWindowProperty if it returned success + + Since Xlib prior to 1.6 didn't always clear values on failure, don't + assume they're safe to use unless we succeeded. + + Reported by Oracle Parfait 1.5.1: + Error: Uninitialised memory (CWE 456) + Possible access to uninitialised memory '&nPixels' + at line 963 of src/parse.c in function 'put_pixel_on_root'. + &nPixels allocated at line 953. + Possible access to uninitialised memory '&retProp' + at line 962 of src/parse.c in function 'put_pixel_on_root'. + &retProp allocated at line 954. + + Signed-off-by: Alan Coopersmith + +commit 76f6ad6e96b1ce62a32767bc0478a17b8b9204d7 +Author: Laurent Carlier +Date: Mon Aug 4 16:39:24 2014 +0200 + + Update manpage with the proper location of system.twmrc file + + Signed-off-by: Laurent Carlier + Reviewed-by: Alan Coopersmith + Signed-off-by: Alan Coopersmith + +commit 0cb43e864b2e9972630556e98caa24abf8928122 +Author: Alan Coopersmith +Date: Mon Jun 2 22:06:21 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith + +commit c33c83fb83be7f6402b615b4b32b5dc2036b951d +Author: Alan Coopersmith +Date: Mon Jun 2 22:06:21 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith + +commit 9c09c3e3577460fcef44e7abe51d22fcbda10ea8 +Author: Gaetan Nadon +Date: Fri Oct 25 21:51:37 2013 -0400 + + config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES + + Fix Automake warning: AC_OUTPUT should be used without arguments. + www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files + + Signed-off-by: Gaetan Nadon + +commit 46c4255ba661145df429d9dc190355a9661da3c1 +Author: Alan Coopersmith +Date: Fri Sep 6 18:59:24 2013 -0700 + + twm 1.0.8 + + Signed-off-by: Alan Coopersmith + +commit 97b55a970dc5281c2d41500990d99fcd24d2dd5f +Author: Alan Coopersmith +Date: Sun Aug 18 10:50:01 2013 -0700 + + Replace malloc(strlen()+1); strcpy(); pairs with strdup() + + Signed-off-by: Alan Coopersmith + +commit 8b2a314c267071656ca4d86bae56c6d82bb8127a +Author: Alan Coopersmith +Date: Sun Aug 18 10:42:45 2013 -0700 + + AddWindow: Use NULL instead of 0 for null pointer check + + Signed-off-by: Alan Coopersmith + +commit c2e232e6915356eba3edf2efea99720746694c52 +Author: Alan Coopersmith +Date: Sun Aug 18 10:28:21 2013 -0700 + + Stop casting return values from malloc & calloc + + Signed-off-by: Alan Coopersmith + +commit 58f3c3b8d518786764f45ac2be1f1f0850129125 +Author: Alan Coopersmith +Date: Sun Aug 18 10:18:21 2013 -0700 + + Stop casting pointers to (char *) when freeing them + + Signed-off-by: Alan Coopersmith + +commit 2a637337713c5c92c44249b88e31696ce9efdf9b +Author: Alan Coopersmith +Date: Wed Jul 31 23:28:42 2013 -0700 + + Delete trailing whitespace in non *.[ch] source files + + Signed-off-by: Alan Coopersmith + +commit ce4e11143f982234be1076e384b31228f1cc84ae +Author: Alan Coopersmith +Date: Wed Jul 31 22:54:01 2013 -0700 + + Make more functions static that aren't called from other files + + Signed-off-by: Alan Coopersmith + +commit 8a3d3a58350506a99efd24f9856466a99bbb9c51 +Author: Alan Coopersmith +Date: Wed Jul 31 22:28:11 2013 -0700 + + Assume C89 signal handlers, returning void + + Removes old #ifdef SIGNALRETURNSINT check that was never defined in + autoconf builds, only old Imake builds. + + Signed-off-by: Alan Coopersmith + +commit afcad0de54ecd1a8bfaf261e4e6882985a234963 +Author: Alan Coopersmith +Date: Wed Jul 31 22:24:22 2013 -0700 + + Make some more previously global variables into file-scoped statics + + Not used from other source files, so no need to export them + + Signed-off-by: Alan Coopersmith + +commit 4c2ff3f0a6bae8b369dfb74267f7fa52d511dfb2 +Author: Alan Coopersmith +Date: Wed Jul 31 22:21:00 2013 -0700 + + Remove unused global variable gotFirstSave + + Signed-off-by: Alan Coopersmith + +commit ca038999b5c1387f3aa19baeafc81a27563631b1 +Author: Alan Coopersmith +Date: Wed Jul 31 22:04:39 2013 -0700 + + unifdef macII - drop support for A/UX 2.0 + + Signed-off-by: Alan Coopersmith + +commit 55681f9d66b788b2e86a5ad3c0722904fa020962 +Author: Alan Coopersmith +Date: Tue Jul 30 22:15:28 2013 -0700 + + Make various helper & callback functions private to session.c + + Nothing else ever called them, so no reason to export them. + + Signed-off-by: Alan Coopersmith + Reviewed-by: + +commit cf88a8c16958ddfaeff6349d30c6c423fc4a7afa +Author: Alan Coopersmith +Date: Tue Jul 30 22:11:51 2013 -0700 + + Convert remaining K&R function declarations to C89 style + + Many existing function declarations were C89, and headers all use C89 + prototypes, but a few function declarations had been left in the old + style. + + Signed-off-by: Alan Coopersmith + Reviewed-by: + +commit ea349d3c406695665322c71caf5ea3c970cb3155 +Author: Alan Coopersmith +Date: Tue Jul 30 21:57:04 2013 -0700 + + Use (void) to declare functions that take no arguments, instead of () + + It's time for C89. + + Signed-off-by: Alan Coopersmith + Reviewed-by: + +commit abb8b6198b639359f34ab6f0ab97039016d8b6db +Author: Colin Harrison +Date: Fri Jul 19 00:48:09 2013 +0100 + + Syntax error in recent twm commit + + twm needs a typo/syntax correction following a recent commit. + + Signed-off-by: Alan Coopersmith + +commit e84f2e87222879ca667c1fb3d1cb3236a1159d12 +Author: Alan Coopersmith +Date: Thu Jul 18 00:24:30 2013 -0700 + + Constification cleanup - fix dozens of gcc warnings + + Signed-off-by: Alan Coopersmith + +commit b16ce9773e4da5897ab546de85e48a3ea58d0e00 +Author: Eric S. Raymond +Date: Wed Jun 19 05:39:10 2013 -0400 + + Don't rely on the ability to set tab stops. + +commit 07ed63f865f6fef4c14711063534b73eb33e0cdb +Author: Egbert Eich +Date: Thu May 19 11:08:21 2011 +0200 + + Fix SEGV if CreateColormapWindow() returns NULL. + + twm can segfault when it cannot collect attribute information on + a window that has been destroyed before it got a chance to collect + it's attributes. + twm seems to assume that it is always able to collect this information + and disregards the error if the function that attempts to collect it + fails and CreateColormapWindow() returns NULL. + If this happens correct number_cmap_windows to prevent a SEGV later + on due to an incorrect setting. + + Signed-off-by: Egbert Eich + +commit b62e91790d1f07f729d4221c878a0847ff14ad82 +Author: Alan Coopersmith +Date: Sat Nov 19 11:38:33 2011 -0800 + + Terminate execl() arguments with NULL instead of 0 + + Makes sure that a full 64-bits of 0 is passed in 64-bit builds, and + clears gcc warning of: + + menus.c: In function ‘System’: + menus.c:2344:2: warning: missing sentinel in function call + + Signed-off-by: Alan Coopersmith + +commit 4c5e72e9d8571bfb2a98d1ffc9724596764f5b0b +Author: Alan Coopersmith +Date: Wed Jul 27 20:33:13 2011 -0700 + + twm 1.0.7 + + Signed-off-by: Alan Coopersmith + +commit f21823506dcb956d62c260e6e207f1dc2ce7732a +Author: Alan Coopersmith +Date: Thu Jul 14 22:04:34 2011 -0700 + + Whitespace fixes in src files + + Signed-off-by: Alan Coopersmith + +commit c6ade914363426facb01a954650b804657114012 +Author: Alan Coopersmith +Date: Tue Jul 12 22:30:41 2011 -0700 + + Replace most sprintf calls with snprintf + + Signed-off-by: Alan Coopersmith + +commit ab689e1a711bbbdfcd6d3a8d2edebbc378ebccb7 +Author: Gaetan Nadon +Date: Mon Mar 7 20:05:45 2011 -0500 + + config: layout the C flags for better readability + + Group pre-processor flags under AM_CPPFLAGS + Might as well do the rest of the file. + + Signed-off-by: Gaetan Nadon + +commit f048770b021d92780c754257c9c1efa7a769c69c +Author: Gaetan Nadon +Date: Mon Mar 7 19:47:48 2011 -0500 + + man: use Autoconf provided $(SED) + + Use platform appropriate version of sed. + + Signed-off-by: Gaetan Nadon + +commit 356ca1db47be674aa9125b65668e8fe0573f7f69 +Author: Gaetan Nadon +Date: Mon Mar 7 19:37:48 2011 -0500 + + config: rm is about removal, not generation + + Automake: + AM_V_at as a prefix to commands that should not output anything in silent mode + + Signed-off-by: Gaetan Nadon + +commit 6f362f8d962ff7054682cfb2d88e8603e1219492 +Author: Gaetan Nadon +Date: Mon Mar 7 16:43:59 2011 -0500 + + deftwmrc.c is not required in MAINTAINERCLEANFILES + + Automake takes care of that as it is part of BUILT_SOURCES + + Signed-off-by: Gaetan Nadon + +commit 98e224e3da245f29d281df357d27b53acdccb5c7 +Author: Gaetan Nadon +Date: Mon Mar 7 16:10:53 2011 -0500 + + lex & yacc: only header file needs to be in BUILT_SOURCES + + http://www.gnu.org/software/automake/manual/automake.html#Yacc-and-Lex + + This completes reversal of commit ea03b6bcd1045dfc0d6947e4858de8994d61170b + The Makefile generates a valid "gram.h: gram.c" rule. + The Makefile already has gram.c gram.h and lex.c in the + maintainer-clean-generic target. + + Signed-off-by: Gaetan Nadon + +commit 70a7f34dfc4d7ea4f7425b9a7359a08a35752bb0 +Author: Jeremy Huddleston +Date: Wed May 11 22:41:56 2011 -0700 + + Add extra sanity checking to avoid possible NULL dereferences + + menus.c:569:10: warning: Access to field 'func' results in a dereference of a null pointer (loaded from variable 'ActiveItem') + if (ActiveItem->func != F_TITLE && !ActiveItem->state) + ^~~~~~~~~~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston + Acked-by: Peter Hutterer + +commit a898b136729660a33d60b317ccb839f6e0428201 +Author: Jeremy Huddleston +Date: Wed May 11 22:30:56 2011 -0700 + + Add sanity checking to avoid a possible NULL dereference + + menus.c:934:26: warning: Access to field 'fore' results in a dereference of a null pointer (loaded from variable 'cur') + cur->hi_back = cur->fore = f3.pixel; + ~~~ ^ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston + Acked-by: Peter Hutterer + +commit 1061e063be78f4e233d550649ce297b639193a9f +Author: Jeremy Huddleston +Date: Wed May 11 22:27:21 2011 -0700 + + Address a possible NULL pointer dereference + + menus.c:523:24: warning: Access to field 'w' results in a dereference of a null pointer (loaded from variable 'ActiveMenu') + if (XFindContext(dpy, ActiveMenu->w, ScreenContext, &context_data) == 0) + ^~~~~~~~~~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston + Acked-by: Peter Hutterer + +commit bde0b06b465adb868d38d3721b95ea337bad8eb9 +Author: Jeremy Huddleston +Date: Wed May 11 22:22:25 2011 -0700 + + Mark Done() as _X_NORETURN + + list.c:103:11: warning: Access to field 'next' results in a dereference of a null pointer (loaded from variable 'nptr') + nptr->next = *list_head; + ~~~~ ^ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston + +commit 2f5d1e29f5a803ba2417d6fe20782c05ed932612 +Author: Jeremy Huddleston +Date: Wed May 11 22:17:54 2011 -0700 + + Silence uninitialized warning + + session.c: In function 'ReadWinConfigFile': + session.c:554: warning: 'version' may be used uninitialized in this function + + Signed-off-by: Jeremy Huddleston + +commit ef39179b9fe6d13f7e81098edfc10711c8b40948 +Author: Jeremy Huddleston +Date: Wed May 11 22:16:23 2011 -0700 + + LP64: Fix formatting for DEBUG printf + + add_window.c: In function 'AddWindow': + add_window.c:169: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'Window' + + Signed-off-by: Jeremy Huddleston + +commit 0f1ccd0b3409ab9b9fce1256fc59ad9bbe69a349 +Author: Alan Coopersmith +Date: Tue May 10 15:35:51 2011 -0700 + + Fix: menus.c:2374: warning: implicit declaration of function `putenv` + + Ensure _GNU_SOURCE is defined on Linux builds before including + so the prototype is exposed in the header properly. + + https://bugs.freedesktop.org/show_bug.cgi?id=32696 + + Signed-off-by: Alan Coopersmith + Reviewed-by: Julien Cristau + +commit 75dd868133c5c12daa946468e7250d174f842281 +Author: Alan Coopersmith +Date: Mon May 9 22:46:03 2011 -0700 + + Remove unused fallback implementation of putenv() + + NOPUTENV was never defined in a modular build, probably because putenv() + is a standard function in Unix98 / SUSv2, and goes back to at least + SVR2 and 4.3BSD-Reno. + + Signed-off-by: Alan Coopersmith + Reviewed-by: Matthieu Herrb + Reviewed-by: Mark Kettenis + +commit 5b763259451b7798b1004c49775d1bd3df2f9d88 +Author: Gaetan Nadon +Date: Fri Mar 4 20:57:30 2011 -0500 + + man: replace hard coded section number with __appmansuffix__ + + Signed-off-by: Gaetan Nadon + +commit 611f20e896aa533f0f3e5cd6c8fdd7c381963c95 +Author: Alan Coopersmith +Date: Wed Jan 5 16:12:42 2011 -0800 + + Fix many gcc strict-aliasing warnings + + menus.c:518: warning: dereferencing type-punned pointer will break strict-aliasing rules + + and many more of the same message at different lines + + Signed-off-by: Alan Coopersmith + +commit b160f7bcb99111e631d6701b199f1dad1e40c80d +Author: Alan Coopersmith +Date: Wed Jan 5 14:09:15 2011 -0800 + + twm 1.0.6 + + Signed-off-by: Alan Coopersmith + +commit 1347a210cafa75db40198f8f9e3ca36f8e627bf6 +Author: Alan Coopersmith +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 + +commit 1ca7092e44e87038ba95a962a3c952ef72b4f146 +Author: Martin Jansa +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 + +commit b3af92c7bca31b3bf73428d46291b88c3f86026e +Author: Alan Coopersmith +Date: Sat Oct 30 15:03:50 2010 -0700 + + twm 1.0.5 + + Signed-off-by: Alan Coopersmith + +commit 7f164a9631e4ec26657bedeb947409d0b484e967 +Author: Alan Coopersmith +Date: Sat Oct 30 15:01:43 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith + +commit 357d089016bd889f2f73349c3f977c6adccc85a6 +Author: Jesse Adkins +Date: Tue Sep 28 13:29:49 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins + +commit 4c7c2ece9e152358448406b759c30eb44eea13f9 +Author: Alan Coopersmith +Date: Thu Sep 23 00:11:56 2010 -0700 + + config: upgrade to util-macros 1.8 for additional man page support + + Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS + The value of MAN_SUBST is the same for all X.Org packages. + + Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS + The existing statement can now be removed from the configuration file. + + Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) + Enables silent rule and use platform appropriate version of sed. + + Signed-off-by: Alan Coopersmith + +commit 3bcc18ca9968a33dbf3e8df920f08227f95d8a72 +Author: Alan Coopersmith +Date: Wed Sep 22 23:59:32 2010 -0700 + + Silence build of deftwmrc.c with AM_V_GEN + + Signed-off-by: Alan Coopersmith + +commit 282060f633c1a0910522f64cf36222a27016bf77 +Author: Alan Coopersmith +Date: Wed Sep 22 23:37:21 2010 -0700 + + system.twmrc doesn't need to be in both EXTRA_DIST & dist_rc_DATA + + Signed-off-by: Alan Coopersmith + +commit 810922b19b86c1ddd5ef9c9169d1328b3562af77 +Author: Alan Coopersmith +Date: Wed Sep 22 23:33:22 2010 -0700 + + config: Remove unnecessary calls from configure.ac + + AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now + PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables + + Signed-off-by: Alan Coopersmith + +commit 79e3387e7a2d35f5895f813a4572a93457114e3c +Author: Alan Coopersmith +Date: Wed Sep 22 23:23:26 2010 -0700 + + Use AC_CHECK_FUNCS / default name for mkstemp + + No longer need to maintain #ifdef compatibility with the names used in + the monolith Imakefiles. + + Signed-off-by: Alan Coopersmith + +commit 3bac463f63b4c1e667256c7d2d287b3567a7ff1c +Author: Gaetan Nadon +Date: Tue Jul 20 18:45:18 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon + +commit 40480fdbe6c15076a2e734cae246c62c85862829 +Author: Alan Coopersmith +Date: Fri Aug 6 08:27:35 2010 -0700 + + Fill in COPYING file with copyright notices from source code + + Signed-off-by: Alan Coopersmith + +commit a9f315f32bcc0636ada7427be9e3c5e3810af05e +Author: Gaetan Nadon +Date: Sat Jul 17 16:36:41 2010 -0400 + + config: allow to build tarball when yacc is missing + + Autoconf does not handle this scenario as well as Automake does. + If gram.c is already there, do not abort the configuration + if yacc is missing as it is not needed. + + If both gram.c and yacc are missing, abort configuration. + Yacc is a required tool to build the package. + + Signed-off-by: Gaetan Nadon + +commit 29a157f7f181ac02c88537032dbcca29880c3068 +Author: Gaetan Nadon +Date: Fri Jun 4 17:09:18 2010 -0400 + + config: add check for yacc to insure it is installed #27973 + + Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" + as a last resort, even if no programs have been found. Improve error + checking by issuing an error message if yacc is not found. The module + cannot build anyway. + + Signed-off-by: Gaetan Nadon + +commit d0da74f035fd3595b5ddfb6ded29bdc5f9666ceb +Author: Alan Coopersmith +Date: Thu Jan 14 21:40:48 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith + +commit 9adc93df944e203726d09716dc3bfbbc6cf304ae +Author: Gaetan Nadon +Date: Thu Nov 26 09:19:52 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 2386d631c301233899bdcc6381203bcbd1139ab3 +Author: Gaetan Nadon +Date: Wed Oct 28 14:09:08 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 7f4c2b588bc94702eb0df0618a97413b0e544879 +Author: Gaetan Nadon +Date: Tue Oct 27 15:07:24 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 5c13f89a73f7b57dad9c9dcfd63e084077550c3e +Author: Gaetan Nadon +Date: Mon Oct 26 22:08:38 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 3d6678095a3553b9ab36d60e6a254acfbdc831c1 +Author: Gaetan Nadon +Date: Thu Oct 22 16:25:53 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit a3f6e3cbd99b6394c3dc70d54f07f129b4ece70c +Author: Jeremy Huddleston +Date: Wed Oct 21 12:47:20 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston + +commit 06d15a482a596f1d846b97627badd28381c2e7b2 +Author: Alan Coopersmith +Date: Thu Oct 1 14:54:20 2009 -0700 + + Add README with pointers to mailing lists, bugzilla, & git + + Signed-off-by: Alan Coopersmith + +commit 4d9e3200b1625ad24053ce5f1ca816a03939c6d5 +Author: Gaetan Nadon +Date: Tue Jul 7 17:32:01 2009 -0400 + + twm: use XORG_CHANGELOG macro to create ChangeLog. #22611 + + Build break: app/twm/Makefile.am: command not found: git-log + Adding the macro in configure.ac and use it in Makefile.am + Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 + Tested: running autogen.sh, make and 'make dist' + + Signed-off-by: Gaetan Nadon + Signed-off-by: Peter Hutterer + +commit 1fa03c39bddace4d787c55703f3081bcaf36511b +Author: Adam Jackson +Date: Thu Mar 6 16:52:54 2008 -0500 + + twm 1.0.4 + +commit d28dffd63bd5070445b15d1b9b70f3303ec5e333 +Author: Alan Coopersmith +Date: Thu Feb 21 08:16:39 2008 -0800 + + Change twm_CFLAGS to AM_CFLAGS to make automake-1.10 happier + + src/Makefile.am:35: compiling `add_window.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac' + +commit ca9494bf50c9314597f4e88efa5bf5d66c1cd38f +Author: Alan Coopersmith +Date: Thu Feb 21 08:14:01 2008 -0800 + + Explicitly require libSM & libICE since twm calls them directly + +commit f0543e7ff17f6e8aefbd6cc003d0679a706a8535 +Author: James Cloos +Date: Thu Dec 6 16:37:07 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 44d51a2bc7d1e2fc5fcd3f729b6f0ca6e62e1f00 +Author: Wolfgang Rupprecht +Date: Mon Jan 23 15:11:00 2006 -0800 + + X.Org Bug #5691: twm mouse button limit too low + + + +commit 03a4e6c35161402d1477acb95723ab93eabde97e +Author: James Cloos +Date: Mon Sep 3 05:51:13 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 9ae787c9f0d02aeb4c67fd20cee08d3cccd99fb4 +Author: James Cloos +Date: Thu Aug 23 19:24:38 2007 -0400 + + Rename .cvsignore to .gitignore + +commit 5f70aaffa0fa88a4b08ea40cfdbde5f34d20d366 +Author: Daniel Stone +Date: Thu Nov 30 19:56:29 2006 +0200 + + bump to 1.0.3 + +commit f27c4a577f68673e5022db1a4db79da9a3d05502 +Author: Matthieu Herrb +Date: Tue Nov 28 13:24:08 2006 +0000 + + Fix system.twmrc handling + +commit 6736d9094d2719f21e3ba0050aad88f3ffc78dc4 +Author: Adam Jackson +Date: Fri Oct 13 17:47:24 2006 -0400 + + Bump to 1.0.2 + +commit 4bc5a25c21006e547ff7fce7fff7544acbb22174 +Author: Alan Coopersmith +Date: Sat Jun 3 07:06:42 2006 +0000 + + Coverity #369: If malloc of entry->wm_command fails, error cleanup was + still trying to read pointers from it to free. + +commit 9680fbed52e3af20d226040958f91502b6027d2d +Author: Alan Coopersmith +Date: Sat Jun 3 06:54:20 2006 +0000 + + Coverity #1508: Variable "action" not freed or pointed-to + +commit ab7a497d995347e340c28c4eb0d1f0f9ee298e41 +Author: Kevin E Martin +Date: Wed Dec 21 02:29:47 2005 +0000 + + Update package version for X11R7 release. + +commit 4bd96f2d5d976dbd17bac563504985a1bc793ffe +Author: Adam Jackson +Date: Mon Dec 19 16:22:41 2005 +0000 + + Stub COPYING files + +commit 2c1cd456efe91302b0de645ea36a84c49472f104 +Author: Kevin E Martin +Date: Thu Dec 15 00:24:04 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 9f88f7db68e146c1d1b60a988f68f1528350a9a8 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:19 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 466a35f33d48427d7f5a186cf60fddd070ce2d71 +Author: Kevin E Martin +Date: Sat Dec 3 05:49:17 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 81d2d1208b1445f60e10186b61e472b22ac47712 +Author: Alan Coopersmith +Date: Mon Nov 28 22:01:39 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 6897ce2b13a0b651c8bb56b833e51125d678ea81 +Author: Eric Anholt +Date: Mon Nov 21 10:34:58 2005 +0000 + + Another pass at .cvsignores for apps. + +commit 3cf0d5d098a049e1113dad20699b07d1a91fd9ca +Author: Eric Anholt +Date: Sun Nov 20 22:08:50 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit d99f0e0b2577cbdfea2a51d8ca20aff080539b60 +Author: Kevin E Martin +Date: Sat Nov 19 07:15:36 2005 +0000 + + Update pkgconfig files to separate library build-time dependencies from + application build-time dependencies, and update package deps to work + with separate build roots. + +commit 6dfc0dee6645c7620cc2fb9a5d44b041cb6558b6 +Author: Kevin E Martin +Date: Wed Oct 19 02:47:50 2005 +0000 + + Update package version number for RC1 release. + +commit 43fb7218e8723f6f3321ec406745971ca5fd0d00 +Author: Alan Coopersmith +Date: Mon Oct 17 23:56:21 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit a85acab665c375d14ae15ef90f6baf8b47c7032b +Author: Alan Coopersmith +Date: Sun Oct 16 22:32:51 2005 +0000 + + Capitalize O in "X.Org Foundation" + Use cpp to substitute variables in man pages + +commit a3bbaecf0502d58cf0bc7ff7db99e9239c6e822c +Author: Kevin E Martin +Date: Sat Oct 15 19:19:03 2005 +0000 + + Have generated files be cleaned by maintainer to pass check-tarball test. + +commit 7ccfcb8e4f4caabba7c26de42ce2db252b5b0817 +Author: Alan Coopersmith +Date: Sun Oct 9 19:11:53 2005 +0000 + + Bug #3755 twm can't + handle 8-bit characters in .twmrc (Tomohiro KUBOITA) + +commit b098cf784d34421de0ae51d8cd7090022d3b2600 +Author: Alan Coopersmith +Date: Sun Oct 9 19:10:58 2005 +0000 + + Bug #3755 twm can't + handle 8-bit characters in .twmrc (Tomohiro KUBOITA) + +commit e2c423a32d8ba724e19e6db5b315ef9011d89488 +Author: Alan Coopersmith +Date: Sun Oct 9 18:59:28 2005 +0000 + + Bug #3755 twm can't + handle 8-bit characters in .twmrc (Tomohiro KUBOITA) + +commit ea03b6bcd1045dfc0d6947e4858de8994d61170b +Author: Keith Packard +Date: Tue Aug 2 18:08:48 2005 +0000 + + Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are + regenerated after 'make clean' and to make parallel builds work right. + +commit a12f281be43c1c86147fb89c99484ac558f64425 +Author: Alan Coopersmith +Date: Mon Aug 1 20:25:28 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit 99c2e9865374605697c2a85099bbc56bf7853969 +Author: Alan Coopersmith +Date: Sat Jul 30 21:07:26 2005 +0000 + + Add prototypes of Xalloc/free functions. + Export ImUtil.h to match modular tree install. + Define SVR4 to 1 to avoid warning about redefining to different values. + Include missing headers to clear more compiler warnings. + +commit 5bf9409bc3c7e11d86bcd5b25760435e199b85c5 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:30 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit b2de9b16ae9b7bfce8e7cc36f20a38084fa25469 +Author: Adam Jackson +Date: Wed Jul 20 19:31:51 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit c0570ffdfa9ef913b5132b2069dd69491f77a8f8 +Author: Matthieu Herrb +Date: Sun Jul 17 20:11:01 2005 +0000 + + fix rules to work with non-GNU make and outside of $srcdir + +commit 29fba3a480ab1b4168d75ed92c8150851dddd805 +Author: Alan Coopersmith +Date: Sat Jul 16 22:07:13 2005 +0000 + + Add #ifdef HAVE_CONFIG_H/#include "config.h" to files that need it to get + HAS_MKSTEMP defined in modular builds. + +commit 63e81296232ec5fdd6529a7d5d4342186bbec2f8 +Author: Alan Coopersmith +Date: Sat Jul 16 21:59:14 2005 +0000 + + Define HAS_MKSTEMP if mkstemp() is present (needed for improved protection + against tempfile race conditions in many places) + +commit 2e6a393e7b0f02e8f58a3005411ae22488965e28 +Author: Søren Sandmann Pedersen +Date: Thu Jul 14 22:36:06 2005 +0000 + + Add _BSD_SOURCE - patch from Stefan Dirsch + +commit 300a4fcbfaef76f78dbb98c9868fa85da1604ccf +Author: Søren Sandmann Pedersen +Date: Thu Jul 14 22:35:37 2005 +0000 + + Add makefile that CVS ate - patch from Stefan Dirsch + +commit 1cb0150431562d729342c427129732b217526bab +Author: Daniel Stone +Date: Mon Jul 11 22:51:03 2005 +0000 + + Bug #3754: Fix window misplacement in twm. (Christopher Mario Mae) + +commit 682eaa7cd21e32f70d909aae7d4828c9f4ea9dd1 +Author: Søren Sandmann Pedersen +Date: Wed Jun 29 19:15:03 2005 +0000 + + Add buildsystem for twm + +commit 718daab22b08a1ab10145f9284dedef069ffb758 +Author: Roland Mainz +Date: Fri Mar 11 21:18:12 2005 +0000 + + xc/programs/twm/Imakefile + xc/programs/twm/twm.c + //bugs.freedesktop.org/show_bug.cgi?id=2705) attachment #2087 + (https://bugs.freedesktop.org/attachment.cgi?id=2087) Make twm ignore + print screens to avoid that users accidentally warp on a non-video + screen (which are not visible on any monitor) when the Xserver has both + video and print screens. (This includes also a small cleanup of + xdpyinfo where parts of the print screen test code comes from) Patch by + Julien Lafon (MIT/X.org license). + +commit 6e96bd376c916c150a055447d4badc1fae84e47a +Author: Roland Mainz +Date: Fri Mar 11 16:23:00 2005 +0000 + + xc/programs/twm/add_window.c + xc/programs/twm/cursor.c + xc/programs/twm/events.c + xc/programs/twm/gc.c + xc/programs/twm/gram.y + xc/programs/twm/iconmgr.c + xc/programs/twm/icons.c + xc/programs/twm/list.c + xc/programs/twm/menus.c + xc/programs/twm/parse.c + xc/programs/twm/resize.c + xc/programs/twm/twm.c + //bugs.freedesktop.org/show_bug.cgi?id=2566) attachment #2083 + (https://bugs.freedesktop.org/attachment.cgi?id=2083) ANSI-fy twm + window manager code. The conversion preserves the comments which + annotate variables and function arguments (these have been moved into + doxygen(esque?) "stubs" above each function. Patch by Mike Owens + . + +commit d045cb62c62f09978798510deaec0acae0a6fb4d +Author: Egbert Eich +Date: Fri Apr 23 19:54:37 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit f39f4c810b3c2071f8786abc32317149373a3e1d +Author: Egbert Eich +Date: Sun Mar 14 08:34:58 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 58d942b4a0b4ed9b99a4dd6501bf4facbcaca670 +Author: Egbert Eich +Date: Wed Mar 3 12:12:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit ee477f9d9c4aff3f52d9a65e3b11b55dd15b31d1 +Author: Egbert Eich +Date: Thu Feb 26 13:36:16 2004 +0000 + + readding XFree86's cvs IDs + +commit e8c79f538be77c2637e8d2e1ada443d9a2f0e262 +Author: Egbert Eich +Date: Thu Feb 26 09:23:58 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit e51f25fbe75b222b24f4628b2408e899fa4748d7 +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:03 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 4b339f0a4311b4db171584bc6671292a9052665a +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:58 2003 +0000 + + XFree86 4.3.0.1 + +commit cfa9fa24253b5ef8045172852509be413d7b00ca +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:58 2003 +0000 + + Initial revision + +commit 03cb750f7935722ab77b77128ca5221c5baf8818 +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:53 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/Makefile.in b/Makefile.in index adaf835..fff3b9b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -180,7 +180,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \ ChangeLog INSTALL README compile config.guess config.sub \ - install-sh missing + depcomp install-sh missing ylwrap DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -285,6 +285,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -339,6 +341,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/README b/README index d1bb4ed..7e3a2cb 100644 --- a/README +++ b/README @@ -1,30 +1,6 @@ -twm - Tab Window Manager for the X Window System - -twm is a window manager for the X Window System. It provides -titlebars, shaped windows, several forms of icon management, -user-defined macro functions, click-to-type and pointer-driven -keyboard focus, and user-specified key and pointer button bindings. - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +twm fork to suit my preferences. The master development code repository can be found at: - git://anongit.freedesktop.org/git/xorg/app/twm - - http://cgit.freedesktop.org/xorg/app/twm - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage + https://gitlab.com/smallm/twmruined diff --git a/README.twm b/README.twm new file mode 100644 index 0000000..d1bb4ed --- /dev/null +++ b/README.twm @@ -0,0 +1,30 @@ +twm - Tab Window Manager for the X Window System + +twm is a window manager for the X Window System. It provides +titlebars, shaped windows, several forms of icon management, +user-defined macro functions, click-to-type and pointer-driven +keyboard focus, and user-specified key and pointer button bindings. + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/app/twm + + http://cgit.freedesktop.org/xorg/app/twm + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + diff --git a/aclocal.m4 b/aclocal.m4 index 7f6d556..e7a4ba8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,1165 +20,71 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2014 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. - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) - -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - -# AM_AUX_DIR_EXPAND -*- Autoconf -*- - -# Copyright (C) 2001-2014 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. - -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to -# '$srcdir', '$srcdir/..', or '$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is '.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. - -AC_DEFUN([AM_AUX_DIR_EXPAND], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -# Expand $ac_aux_dir to an absolute path. -am_aux_dir=`cd "$ac_aux_dir" && pwd` -]) - -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997-2014 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. - -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ([2.52])dnl - m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) - -# Copyright (C) 1999-2014 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. - - -# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], - [$1], [CXX], [depcc="$CXX" am_compiler_list=], - [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], - [$1], [UPC], [depcc="$UPC" am_compiler_list=], - [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES. -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE([dependency-tracking], [dnl -AS_HELP_STRING( - [--enable-dependency-tracking], - [do not reject slow dependency extractors]) -AS_HELP_STRING( - [--disable-dependency-tracking], - [speeds up one-time build])]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999-2014 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. - - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Older Autoconf quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996-2014 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. - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. -m4_define([AC_PROG_CC], -m4_defn([AC_PROG_CC]) -[_AM_PROG_CC_C_O -]) - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.65])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[AC_DIAGNOSE([obsolete], - [$0: two- and three-arguments forms are deprecated.]) -m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), - [ok:ok],, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) - AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) -AM_MISSING_PROG([AUTOCONF], [autoconf]) -AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) -AM_MISSING_PROG([AUTOHEADER], [autoheader]) -AM_MISSING_PROG([MAKEINFO], [makeinfo]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target (and possibly the TAP driver). The -# system "awk" is bad on some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES([CC])], - [m4_define([AC_PROG_CC], - m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES([CXX])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES([OBJC])], - [m4_define([AC_PROG_OBJC], - m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], - [_AM_DEPENDENCIES([OBJCXX])], - [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl -]) -AC_REQUIRE([AM_SILENT_RULES])dnl -dnl The testsuite driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This -dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) - fi -fi -dnl The trailing newline in this macro's definition is deliberate, for -dnl backward compatibility and to allow trailing 'dnl'-style comments -dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. -]) - -dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001-2014 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. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) - -# Copyright (C) 2003-2014 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. - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001-2014 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. - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- - -# Copyright (C) 1997-2014 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. - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it is modern enough. -# If it is, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright (C) 2001-2014 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. - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# -------------------- -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) - -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Copyright (C) 1999-2014 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. - -# _AM_PROG_CC_C_O -# --------------- -# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC -# to automatically call this. -AC_DEFUN([_AM_PROG_CC_C_O], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -AC_LANG_PUSH([C])dnl -AC_CACHE_CHECK( - [whether $CC understands -c and -o together], - [am_cv_prog_cc_c_o], - [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ - && test -f conftest2.$ac_objext; then - : OK - else - am_cv_prog_cc_c_o=no - break - fi - done - rm -f core conftest* - unset am_i]) -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -AC_LANG_POP([C])]) - -# For backward compatibility. -AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) - -# Copyright (C) 2001-2014 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. - -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) - -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996-2014 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. - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac - -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken - alias in your environment]) - fi - if test "$[2]" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT([yes]) -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! -fi -AC_CONFIG_COMMANDS_PRE( - [AC_MSG_CHECKING([that generated files are newer than configure]) - if test -n "$am_sleep_pid"; then - # Hide warnings about reused PIDs. - wait $am_sleep_pid 2>/dev/null - fi - AC_MSG_RESULT([done])]) -rm -f conftest.file -]) - -# Copyright (C) 2009-2014 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. - -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], [dnl -AS_HELP_STRING( - [--enable-silent-rules], - [less verbose build output (undo: "make V=1")]) -AS_HELP_STRING( - [--disable-silent-rules], - [verbose build output (undo: "make V=0")])dnl -]) -case $enable_silent_rules in @%:@ ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) dnl -dnl A few 'make' implementations (e.g., NonStop OS and NextStep) -dnl do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [if AS_ECHO([['TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. -# Copyright (C) 2001-2014 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. +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor 'install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in "make install-strip", and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# Copyright (C) 2006-2014 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. - -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) - -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) - -# Check how to create a tarball. -*- Autoconf -*- - -# Copyright (C) 2004-2014 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. - -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of 'v7', 'ustar', or 'pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], - - [pax], - [], - - [m4_fatal([Unknown tar format])]) - - AC_MSG_CHECKING([how to create a $1 tar archive]) - - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break - - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir - - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$1])]) - -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -1191,46 +97,49 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" elif test -n "$PKG_CONFIG"; then PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], [pkg_failed=yes]) else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -1238,19 +147,17 @@ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac AC_DEFUN([PKG_CHECK_MODULES], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl @@ -1267,16 +174,17 @@ and $1[]_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -1284,27 +192,109 @@ $$1_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl @@ -1730,13 +720,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" + +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]) @@ -3201,3 +2202,1133 @@ echo 'git directory not found: installing possibly empty changelog.' >&2)" AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG +# Copyright (C) 2002-2014 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. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.15' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.15], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.15])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2014 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. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2014 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. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2014 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. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2014 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. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2014 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. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2014 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. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2014 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. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2014 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. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2014 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. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2014 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. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2014 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. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 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. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2014 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. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2014 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. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2014 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. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2014 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. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2014 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. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff --git a/configure b/configure index 423752a..d8120ce 100755 --- a/configure +++ b/configure @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for twm 1.0.9. +# Generated by GNU Autoconf 2.69 for twmruined 0.1. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -267,11 +267,10 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://bugs.freedesktop.org/enter_bug.cgi?product=xorg -$0: about your system, including any error possibly output -$0: before this message. Then install a modern shell, or -$0: manually run the script under such a shell if you do -$0: have one." +$0: https://gitlab.com/smallm/twmruined about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -579,11 +578,11 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME='twm' -PACKAGE_TARNAME='twm' -PACKAGE_VERSION='1.0.9' -PACKAGE_STRING='twm 1.0.9' -PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' +PACKAGE_NAME='twmruined' +PACKAGE_TARNAME='twmruined' +PACKAGE_VERSION='0.1' +PACKAGE_STRING='twmruined 0.1' +PACKAGE_BUGREPORT='https://gitlab.com/smallm/twmruined' PACKAGE_URL='' ac_unique_file="Makefile.am" @@ -659,6 +658,8 @@ build_vendor build_cpu build INSTALL_CMD +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG CHANGELOG_CMD STRICT_CFLAGS @@ -730,6 +731,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -767,6 +769,8 @@ LIBS CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR YACC YFLAGS TWM_CFLAGS @@ -809,6 +813,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1061,6 +1066,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1198,7 +1212,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1311,7 +1325,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 twm 1.0.9 to adapt to many kinds of systems. +\`configure' configures twmruined 0.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1351,6 +1365,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1359,7 +1374,7 @@ Fine tuning of the installation directories: --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/twm] + --docdir=DIR documentation root [DATAROOTDIR/doc/twmruined] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@ -1381,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of twm 1.0.9:";; + short | recursive ) echo "Configuration of twmruined 0.1:";; esac cat <<\_ACEOF @@ -1412,6 +1427,10 @@ Some influential environment variables: you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path YACC The `Yet Another Compiler Compiler' implementation to use. Defaults to the first program found out of: `bison -y', `byacc', `yacc'. @@ -1424,7 +1443,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1487,7 +1506,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -twm configure 1.0.9 +twmruined configure 0.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1646,9 +1665,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------------------------------------------- ## -## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ## -## ---------------------------------------------------------------------- ##" +( $as_echo "## -------------------------------------------------- ## +## Report this to https://gitlab.com/smallm/twmruined ## +## -------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1902,7 +1921,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 twm $as_me 1.0.9, which was +It was created by twmruined $as_me 0.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4139,8 +4158,8 @@ fi # Define the identity of the package. - PACKAGE='twm' - VERSION='1.0.9' + PACKAGE='twmruined' + VERSION='0.1' cat >>confdefs.h <<_ACEOF @@ -4579,6 +4598,11 @@ fi + + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4691,7 +4715,6 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } PKG_CONFIG="" fi - fi # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -11093,6 +11116,7 @@ if test -n "$TWM_CFLAGS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWM_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11109,6 +11133,7 @@ if test -n "$TWM_LIBS"; then $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_TWM_LIBS=`$PKG_CONFIG --libs "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes fi @@ -11119,6 +11144,8 @@ fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -11126,9 +11153,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - TWM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>&1` + TWM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>&1` else - TWM_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>&1` + TWM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 xext xt xmu ice sm xproto >= 7.0.17" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$TWM_PKG_ERRORS" >&5 @@ -11142,9 +11169,10 @@ installed software in a non-standard prefix. Alternatively, you may set the environment variables TWM_CFLAGS and TWM_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it @@ -11162,7 +11190,7 @@ else TWM_LIBS=$pkg_cv_TWM_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile" @@ -11697,7 +11725,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 twm $as_me 1.0.9, which was +This file was extended by twmruined $as_me 0.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11757,13 +11785,13 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -twm config.status 1.0.9 +twmruined config.status 0.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0da57db..1e3d9b7 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,8 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([twm], [1.0.9], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [twm]) +AC_INIT([twmruined], [0.1], + [https://gitlab.com/smallm/twmruined], [twmruined]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) AC_USE_SYSTEM_EXTENSIONS diff --git a/man/Makefile.am b/man/Makefile.am index f59d5b5..961b518 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,7 +23,7 @@ appmandir = $(APP_MAN_DIR) -appman_PRE = twm.man +appman_PRE = twmruined.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) diff --git a/man/Makefile.in b/man/Makefile.in index 29f812f..0271d2d 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -234,6 +234,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -288,6 +290,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -297,7 +300,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ appmandir = $(APP_MAN_DIR) -appman_PRE = twm.man +appman_PRE = twmruined.man appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) diff --git a/man/twm.man b/man/twmruined.man similarity index 94% rename from man/twm.man rename to man/twmruined.man index d1dbaa0..3ecc3ed 100644 --- a/man/twm.man +++ b/man/twmruined.man @@ -37,14 +37,14 @@ .if n .sp 1 .if t .sp .5 .. -.TH TWM 1 __xorgversion__ +.TH TWMRUINED 1 __xorgversion__ .SH NAME -twm \- Tab Window Manager for the X Window System +twmruined \- No longer quite the Tab Window Manager .SH SYNTAX -\fBtwm \fP[ \fB\-display\fP \fIdpy\fP ] [ \fB\-s\fP ] +\fBtwmruined \fP[ \fB\-display\fP \fIdpy\fP ] [ \fB\-s\fP ] [ \fB\-f\fP \fIinitfile\fP ] [ \fB\-v\fP ] .SH DESCRIPTION -\fITwm\fP is a window manager for the X Window System. It provides +\fITwmruined\fP is a window manager for the X Window System based on twm. It provides titlebars, shaped windows, several forms of icon management, user-defined macro functions, click-to-type and pointer-driven keyboard focus, and user-specified @@ -52,8 +52,8 @@ key and pointer button bindings. .PP This program is usually started by the user's session manager or startup script. When used from \fIxdm(__appmansuffix__)\fP or \fIxinit(__appmansuffix__)\fP without -a session manager, \fItwm\fP is frequently executed in the foreground -as the last client. When run this way, exiting \fItwm\fP causes the +a session manager, \fItwmruined\fP is frequently executed in the foreground +as the last client. When run this way, exiting \fItwmruined\fP causes the session to be terminated (i.e., logged out). .PP By default, application windows are surrounded by a ``frame'' with a @@ -80,7 +80,7 @@ region, dragging a window outline to the new location, and then releasing when the outline is in the desired position. Just clicking in the title or highlight region raises the window without moving it. .PP -When new windows are created, \fItwm\fP will honor any size and location +When new windows are created, \fItwmruined\fP will honor any size and location information requested by the user (usually through \fI-geometry\fP command line argument or resources for the individual applications). Otherwise, an outline of the window's default size, its titlebar, and lines @@ -95,7 +95,7 @@ described above. Clicking pointer Button3 (usually the right pointer button) will give the window its current position but attempt to make it long enough to touch the bottom the screen. .SH OPTIONS -\fITwm\fP accepts the following command line options: +\fITwmruined\fP accepts the following command line options: .PP .TP 8 .B \-display \fIdpy\fP @@ -104,47 +104,47 @@ This option specifies the X server to use. .B \-s This option indicates that only the default screen (as specified by \fB\-display\fP or by the \fBDISPLAY\fP environment variable) should be -managed. By default, \fItwm\fP will attempt to manage +managed. By default, \fItwmruined\fP will attempt to manage all screens on the display. .TP 8 .B \-f \fIfilename\fP This option specifies the name of the startup file to use. By default, -\fItwm\fP will look in the user's home directory for files -named \fI.twmrc.num\fP (where \fInum\fP is a screen number) or \fI.twmrc\fP. +\fItwmruined\fP will look in the user's home directory for files +named \fI.twmruinedrc.num\fP (where \fInum\fP is a screen number) or \fI.twmruinedrc\fP. .TP 8 .B \-v -This option indicates that \fItwm\fP should print error messages whenever +This option indicates that \fItwmruined\fP should print error messages whenever an unexpected X Error event is received. This can be useful when debugging applications but can be distracting in regular use. .SH CUSTOMIZATION .PP -Much of \fItwm\fP's appearance and behavior can be controlled by providing +Much of \fItwmruined\fP's appearance and behavior can be controlled by providing a startup file in one of the following locations (searched in order for -each screen being managed when \fItwm\fP begins): +each screen being managed when \fItwmruined\fP begins): .TP 8 -.B "$HOME/.twmrc.\fIscreennumber\fP" +.B "$HOME/.twmruinedrc.\fIscreennumber\fP" The \fIscreennumber\fP is a small positive number (e.g. 0, 1, etc.) representing the screen number (e.g. the last number in the DISPLAY environment variable \fIhost:displaynum.screennum\fP) that would be used to contact that screen of the display. This is intended for displays with multiple screens of differing visual types. .TP 8 -.B "$HOME/.twmrc" +.B "$HOME/.twmruinedrc" This is the usual name for an individual user's startup file. .TP 8 -.B __datadir__/X11/twm/system.twmrc -If neither of the preceding files are found, \fItwm\fP will look in this +.B __datadir__/X11/twmruined/system.twmruinedrc +If neither of the preceding files are found, \fItwmruined\fP will look in this file for a default configuration. This is often tailored by the site administrator to provide convenient menus or familiar bindings for novice users. .PP -If no startup files are found, \fItwm\fP will use the built-in defaults -described above. The only resource used by \fItwm\fP is +If no startup files are found, \fItwmruined\fP will use the built-in defaults +described above. The only resource used by \fItwmruined\fP is \fIbitmapFilePath\fP for a colon-separated list of directories to search when looking for bitmap files (for more information, see the \fIAthena Widgets\fP manual and \fIxrdb(__appmansuffix__)\fP). .PP -\fITwm\fP startup files are logically broken up into three types of +\fITwmruined\fP startup files are logically broken up into three types of specifications: \fIVariables\fP, \fIBindings\fP, \fIMenus\fP. The \fIVariables\fP section must come first and is used to describe the fonts, colors, cursors, border widths, icon and window placement, highlighting, @@ -163,7 +163,7 @@ of a string causes the remainder of the line in which the character appears to be treated as a comment. .SH VARIABLES .PP -Many of the aspects of \fItwm\fP's user interface are controlled by variables +Many of the aspects of \fItwmruined\fP's user interface are controlled by variables that may be set in the user's startup file. Some of the options are enabled or disabled simply by the presence of a particular keyword. Other options require keywords, numbers, strings, or lists of all of these. @@ -205,7 +205,7 @@ or \fB:delete\fP (both refer to the X logo), and \fB:question\fP (the question mark used for non-existent bitmap files). .PP -The following variables may be specified at the top of a \fItwm\fP startup +The following variables may be specified at the top of a \fItwmruined\fP startup file. Lists of Window name prefix strings are indicated by \fIwin-list\fP. Optional arguments are shown in square brackets: .IP "\fBAutoRaise\fP { \fIwin-list\fP }" 8 @@ -223,7 +223,7 @@ same amount. This allows the resizing of windows that extend off the edge of the screen. If the pointer is in the center of the window, or if the resize is begun by pressing a -titlebutton, \fItwm\fP will still wait for the pointer to cross a window +titlebutton, \fItwmruined\fP will still wait for the pointer to cross a window edge (to prevent accidents). This option is particularly useful for people who like the press-drag-release method of sweeping out window sizes. @@ -258,7 +258,7 @@ per-window colors to be specified. The default is "black". .IP "\fBBorderWidth\fP \fIpixels\fP" 8 This variable specifies the width in pixels of the border surrounding all client window frames if \fBClientBorderWidth\fP has not been specified. -This value is also used to set the border size of windows created by \fItwm\fP +This value is also used to set the border size of windows created by \fItwmruined\fP (such as the icon manager). The default is 2. .IP "\fBButtonIndent\fP \fIpixels\fP" 8 This variable specifies the amount by which titlebuttons should be @@ -320,7 +320,7 @@ of time when invoking \fBf.move\fP will cause the window to be moved only in a horizontal or vertical direction. Setting this value to 0 will disable constrained moves. The default is 400 milliseconds. .IP "\fBCursors\fP { \fIcursor-list\fP }" 8 -This variable specifies the glyphs that \fItwm\fP should use for various +This variable specifies the glyphs that \fItwmruined\fP should use for various pointer cursors. Each cursor may be defined either from the \fBcursor\fP font or from two bitmap files. Shapes from the \fBcursor\fP font may be specified directly as: @@ -591,7 +591,7 @@ This variable specifies the number of pixels the pointer must move before the \fBf.move\fP function starts working. Also see the \fBf.deltastop\fP function. The default is zero pixels. .IP "\fBNoBackingStore\fP" 8 -This variable indicates that \fItwm\fP's menus should not request backing +This variable indicates that \fItwmruined\fP's menus should not request backing store to minimize repainting of menus. This is typically used with servers that can repaint faster than they can handle backing store. .IP "\fBNoCaseSensitive\fP" 8 @@ -603,7 +603,7 @@ This variable indicates that \fItwm\fP should not supply the default titlebuttons and bindings. This option should only be used if the startup file contains a completely new set of bindings and definitions. .IP "\fBNoGrabServer\fP" 8 -This variable indicates that \fItwm\fP should not grab the server +This variable indicates that \fItwmruined\fP should not grab the server when popping up menus and moving opaque windows. .IP "\fBNoHighlight\fP [{ \fIwin-list\fP }]" 8 This variable indicates that borders should not be highlighted to track the @@ -649,11 +649,11 @@ optional \fIwin-list\fP is given, only those windows will not have titlebars. \fBMakeTitle\fP may be used with this option to force titlebars to be put on specific windows. .IP "\fBNoTitleFocus\fP" 8 -This variable indicates that \fItwm\fP should not set keyboard input focus to -each window as it is entered. Normally, \fItwm\fP sets the focus +This variable indicates that \fItwmruined\fP should not set keyboard input focus to +each window as it is entered. Normally, \fItwmruined\fP sets the focus so that focus and key events from the titlebar and icon managers are delivered to the application. If the pointer is moved -quickly and \fItwm\fP is slow to respond, input can be directed to the old +quickly and \fItwmruined\fP is slow to respond, input can be directed to the old window instead of the new. This option is typically used to prevent this ``input lag'' and to work around bugs in older applications that have problems with focus events. @@ -682,7 +682,7 @@ may be specified: .EE The default for \fITitleHighlight\fP is to use an even stipple pattern. .IP "\fBPriority\fP \fIpriority\fP" 8 -This variable sets \fItwm\fP's priority. \fIpriority\fP should be an +This variable sets \fItwmruined\fP's priority. \fIpriority\fP should be an unquoted, signed number (e.g. 999). This variable has an effect only if the server supports the SYNC extension. .IP "\fBRandomPlacement\fP" 8 @@ -694,7 +694,7 @@ This variable specifies the font to be used for in the dimensions window when resizing windows. The default is "fixed". .IP "\fBRestartPreviousState\fP" 8 This variable indicates that -\fItwm\fP should attempt to use the WM_STATE property on client windows +\fItwmruined\fP should attempt to use the WM_STATE property on client windows to tell which windows should be iconified and which should be left visible. This is typically used to try to regenerate the state that the screen was in before the previous window manager was shutdown. @@ -722,14 +722,14 @@ This would place on the root window 3 pixel values for borders and titlebars, as well as the three color strings, all taken from the default colormap. .IP "\fBShowIconManager\fP" 8 This variable indicates that the icon manager window should be displayed when -\fItwm\fP is started. It can always be brought up using the +\fItwmruined\fP is started. It can always be brought up using the \fBf.showiconmgr\fP function. .IP "\fBSortIconManager\fP" 8 This variable indicates that entries in the icon manager should be sorted alphabetically rather than by simply appending new windows to the end. .IP "\fBSqueezeTitle\fP [{ \fIsqueeze-list\fP }] " 8 -This variable indicates that \fItwm\fP should attempt to use the SHAPE +This variable indicates that \fItwmruined\fP should attempt to use the SHAPE extension to make titlebars occupy only as much screen space as they need, rather than extending all the way across the top of the window. The optional \fIsqueeze-list\fP @@ -795,12 +795,12 @@ used as the default icon. This bitmap will be used as the icon of all clients which do not provide an icon bitmap and are not listed in the \fBIcons\fP list. .IP "\fBUsePPosition\fP \fIstring\fP" 8 -This variable specifies whether or not \fItwm\fP should honor +This variable specifies whether or not \fItwmruined\fP should honor program-requested locations (given by the \fBPPosition\fP flag in the WM_NORMAL_HINTS property) in the absence of a user-specified position. The argument \fIstring\fP may have one of three values: \fB"off"\fP (the default) -indicating that \fItwm\fP +indicating that \fItwmruined\fP should ignore the program-supplied position, \fB"on"\fP indicating that the position should be used, and @@ -826,7 +826,7 @@ variety of of distinguishable colors when exclusive-or'ed with the contents of the user's typical screen. Setting this variable to 1 often gives nice results if adjacent colors in the default colormap are distinct. By default, -\fItwm\fP will attempt to cause temporary lines to appear at the opposite +\fItwmruined\fP will attempt to cause temporary lines to appear at the opposite end of the colormap from the graphics. .IP "\fBZoom\fP [ \fIcount\fP ]" 8 This variable indicates that outlines suggesting movement of a window @@ -921,11 +921,11 @@ use the following bindings: "Up" = m : all : f.upiconmgr "Down" = m | s : all : f.downiconmgr .EE -\fITwm\fP provides many more window manipulation primitives than can be +\fITwmruined\fP provides many more window manipulation primitives than can be conveniently stored in a titlebar, menu, or set of key bindings. Although a small set of defaults are supplied (unless the \fBNoDefaults\fP is specified), most users will want to have their most common operations -bound to key and button strokes. To do this, \fItwm\fP associates names +bound to key and button strokes. To do this, \fItwmruined\fP associates names with each of the primitives and provides \fIuser-defined functions\fP for building higher level primitives and \fImenus\fP for interactively selecting among groups of functions. @@ -968,7 +968,7 @@ This function lowers the top-most window that occludes another window. This function raises the bottom-most window that is occluded by another window. .IP "\fBf.colormap\fP \fIstring\fP" 8 This function rotates the colormaps (obtained from the WM_COLORMAP_WINDOWS -property on the window) that \fItwm\fP will display when the pointer +property on the window) that \fItwmruined\fP will display when the pointer is in this window. The argument \fIstring\fP may have one of the following values: \fB"next"\fP, \fB"prev"\fP, and \fB"default"\fP. It should be noted here that in general, the installed colormap is determined by keyboard focus. @@ -1087,8 +1087,8 @@ the numeric value of the argument \fIstring\fP, which should be a signed integer in double quotes (e.g. "999" ). This function has an effect only if the server supports the SYNC extension. .IP "\fBf.quit\fP" 8 -This function causes \fItwm\fP to restore the window's borders and exit. If -\fItwm\fP is the first client invoked from \fIxdm\fP, this will result in a +This function causes \fItwmruined\fP to restore the window's borders and exit. If +\fItwmruined\fP is the first client invoked from \fIxdm\fP, this will result in a server reset. .IP "\fBf.raise\fP" 8 This function raises the selected window. @@ -1103,9 +1103,9 @@ This function displays an outline of the selected window. Crossing a border rubber band until the invoking button is released. To abort a resize, press another button before releasing the first button. .IP "\fBf.restart\fP" 8 -This function kills and restarts \fItwm\fP. +This function kills and restarts \fItwmruined\fP. .IP "\fBf.startwm\fP \fIstring\fP" 8 -This function kills \fItwm\fP and starts another window manager, as +This function kills \fItwmruined\fP and starts another window manager, as specified by \fIstring\fP. .IP "\fBf.righticonmgr\fI" 8 This function is similar to \fBf.nexticonmgr\fP except that wrapping does @@ -1127,17 +1127,17 @@ This function sorts the entries in the current icon manager alphabetically. See the variable \fBSortIconManager\fP. .\".IP "\fBf.source\fP \fIstring\fP" 8 .\"This function assumes \fIstring\fP is a file name. The file is read -.\"and parsed as a \fItwm\fP startup file. +.\"and parsed as a \fItwmruined\fP startup file. .\"This .\"function is intended to be used only to re-build pull-down menus. None -.\"of the \fItwm\fP variables are changed. +.\"of the \fItwmruined\fP variables are changed. .IP "\fBf.title\fP" 8 This function provides a centered, unselectable item in a menu definition. It should not be used in any other context. .IP "\fBf.topzoom\fP" 8 This variable is similar to the \fBf.bottomzoom\fP function except that the selected window is only resized to the top half of the display. -.\".IP "\fBf.twmrc\fP" 8 +.\".IP "\fBf.twmruinedrc\fP" 8 .\"This function causes the startup customization file to be re-read. This .\"function is exactly like the \fBf.source\fP function without having to .\"specify the filename. @@ -1148,7 +1148,7 @@ when a focused window is no longer desired. This function warps the pointer to the previous row in the current icon manager, wrapping to the last row in the same column if necessary. .\".IP "\fBf.version\fI" 8 -.\"This function causes the \fItwm\fP version window to be displayed. This +.\"This function causes the \fItwmruined\fP version window to be displayed. This .\"window will be displayed until a pointer button is pressed or the .\"pointer is moved from one window to another. .IP "\fBf.vlzoom\fP" 8 @@ -1218,7 +1218,7 @@ The \fIfunction\fP portion of the menu entry is one of the functions, including any user-defined functions, or additional menus. .PP There is a special menu named \fBTwmWindows\fP which contains the names of -all of the client and \fItwm\fP-supplied windows. Selecting an entry will +all of the client and \fItwmruined\fP-supplied windows. Selecting an entry will cause the \fBWindowFunction\fP to be executed on that window. If \fBWindowFunction\fP hasn't been set, the window will be deiconified and raised. @@ -1261,9 +1261,9 @@ they may be lost if they are iconified and no bindings to .SH FILES .PP .nf -.I $HOME/.twmrc. -.I $HOME/.twmrc -.I __projectroot__/lib/X11/twm/system.twmrc +.I $HOME/.twmruinedrc. +.I $HOME/.twmruinedrc +.I __projectroot__/lib/X11/twmruined/system.twmruinedrc .fi .SH "ENVIRONMENT VARIABLES" .IP "DISPLAY" 8 @@ -1271,7 +1271,7 @@ This variable is used to determine which X server to use. It is also set during \fBf.exec\fP so that programs come up on the proper screen. .IP "HOME" 8 This variable is used as the prefix for files that begin with a tilde and -for locating the \fItwm\fP startup file. +for locating the \fItwmruined\fP startup file. .SH "SEE ALSO" .PP X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xrdb(__appmansuffix__) diff --git a/src/Makefile.am b/src/Makefile.am index 092d8ce..941d552 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,20 +22,20 @@ AM_YFLAGS = -d -bin_PROGRAMS = twm +bin_PROGRAMS = twmruined -rcdir = ${datadir}/X11/twm -dist_rc_DATA = system.twmrc +rcdir = ${datadir}/X11/twmruined +dist_rc_DATA = system.twmruinedrc AM_CPPFLAGS = \ -DXVENDORNAME=\"The\ X.Org\ Foundation\" \ -DXORG_RELEASE=\"Release\ $(VERSION)\" \ - -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\" + -DSYSTEM_INIT_FILE=\"${datadir}/X11/twmruined/system.twmruinedrc\" AM_CFLAGS = $(TWM_CFLAGS) -twm_LDADD = $(TWM_LIBS) +twmruined_LDADD = $(TWM_LIBS) -twm_SOURCES = \ +twmruined_SOURCES = \ add_window.c \ add_window.h \ cursor.c \ @@ -70,15 +70,15 @@ twm_SOURCES = \ BUILT_SOURCES = gram.h deftwmrc.c -deftwmrc.c: system.twmrc +deftwmrc.c: system.twmruinedrc $(AM_V_at)rm -f $@ ; \ echo '/* ' >>$@ ; \ echo ' * This file is generated automatically from the default' >>$@ ; \ - echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ ; \ + echo ' * twmruined bindings file system.twmruinedrc by the twmruined Makefile.' >>$@ ; \ echo ' */' >>$@ ; \ echo '' >>$@ ; \ echo 'unsigned char *defTwmrc[] = {' >>$@ ; \ - $(SED) -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@ ; \ + $(SED) -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmruinedrc >>$@ ; \ echo ' (unsigned char *) 0 };' >>$@ EXTRA_DIST = deftwmrc.sed siconify.bm diff --git a/src/Makefile.in b/src/Makefile.in index a81f5ea..e85cfd2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -111,7 +111,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = twm$(EXEEXT) +bin_PROGRAMS = twmruined$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -124,15 +124,15 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" PROGRAMS = $(bin_PROGRAMS) -am_twm_OBJECTS = add_window.$(OBJEXT) cursor.$(OBJEXT) \ +am_twmruined_OBJECTS = add_window.$(OBJEXT) cursor.$(OBJEXT) \ deftwmrc.$(OBJEXT) events.$(OBJEXT) gc.$(OBJEXT) \ iconmgr.$(OBJEXT) icons.$(OBJEXT) list.$(OBJEXT) \ menus.$(OBJEXT) parse.$(OBJEXT) resize.$(OBJEXT) \ session.$(OBJEXT) twm.$(OBJEXT) util.$(OBJEXT) \ version.$(OBJEXT) gram.$(OBJEXT) lex.$(OBJEXT) -twm_OBJECTS = $(am_twm_OBJECTS) +twmruined_OBJECTS = $(am_twmruined_OBJECTS) am__DEPENDENCIES_1 = -twm_DEPENDENCIES = $(am__DEPENDENCIES_1) +twmruined_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -174,8 +174,8 @@ AM_V_YACC = $(am__v_YACC_@AM_V@) am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) am__v_YACC_0 = @echo " YACC " $@; am__v_YACC_1 = -SOURCES = $(twm_SOURCES) -DIST_SOURCES = $(twm_SOURCES) +SOURCES = $(twmruined_SOURCES) +DIST_SOURCES = $(twmruined_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -293,6 +293,8 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -347,6 +349,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -356,16 +359,16 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_YFLAGS = -d -rcdir = ${datadir}/X11/twm -dist_rc_DATA = system.twmrc +rcdir = ${datadir}/X11/twmruined +dist_rc_DATA = system.twmruinedrc AM_CPPFLAGS = \ -DXVENDORNAME=\"The\ X.Org\ Foundation\" \ -DXORG_RELEASE=\"Release\ $(VERSION)\" \ - -DSYSTEM_INIT_FILE=\"${datadir}/X11/twm/system.twmrc\" + -DSYSTEM_INIT_FILE=\"${datadir}/X11/twmruined/system.twmruinedrc\" AM_CFLAGS = $(TWM_CFLAGS) -twm_LDADD = $(TWM_LIBS) -twm_SOURCES = \ +twmruined_LDADD = $(TWM_LIBS) +twmruined_SOURCES = \ add_window.c \ add_window.h \ cursor.c \ @@ -480,9 +483,9 @@ gram.h: gram.c @if test ! -f $@; then rm -f gram.c; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) gram.c; else :; fi -twm$(EXEEXT): $(twm_OBJECTS) $(twm_DEPENDENCIES) $(EXTRA_twm_DEPENDENCIES) - @rm -f twm$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(twm_OBJECTS) $(twm_LDADD) $(LIBS) +twmruined$(EXEEXT): $(twmruined_OBJECTS) $(twmruined_DEPENDENCIES) $(EXTRA_twmruined_DEPENDENCIES) + @rm -f twmruined$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(twmruined_OBJECTS) $(twmruined_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -762,15 +765,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_rcDATA .PRECIOUS: Makefile -deftwmrc.c: system.twmrc +deftwmrc.c: system.twmruinedrc $(AM_V_at)rm -f $@ ; \ echo '/* ' >>$@ ; \ echo ' * This file is generated automatically from the default' >>$@ ; \ - echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ ; \ + echo ' * twmruined bindings file system.twmruinedrc by the twmruined Makefile.' >>$@ ; \ echo ' */' >>$@ ; \ echo '' >>$@ ; \ echo 'unsigned char *defTwmrc[] = {' >>$@ ; \ - $(SED) -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmrc >>$@ ; \ + $(SED) -f ${srcdir}/deftwmrc.sed < ${srcdir}/system.twmruinedrc >>$@ ; \ echo ' (unsigned char *) 0 };' >>$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/deftwmrc.c b/src/deftwmrc.c index 3752196..3fced76 100644 --- a/src/deftwmrc.c +++ b/src/deftwmrc.c @@ -1,6 +1,6 @@ /* * This file is generated automatically from the default - * twm bindings file system.twmrc by the twm Makefile. + * twmruined bindings file system.twmruinedrc by the twmruined Makefile. */ unsigned char *defTwmrc[] = { diff --git a/src/system.twmrc b/src/system.twmruinedrc similarity index 93% rename from src/system.twmrc rename to src/system.twmruinedrc index 548f5dd..720e038 100644 --- a/src/system.twmrc +++ b/src/system.twmruinedrc @@ -1,6 +1,6 @@ # -# Default twm configuration file; needs to be kept small to conserve string -# space in systems whose compilers don't handle medium-sized strings. +# Default twmruined configuration file; needs to be kept small to conserve +# string space in systems whose compilers don't handle medium-sized strings. # # Sites should tailor this file, providing any extra title buttons, menus, etc. # that may be appropriate for their environment. For example, if most of the diff --git a/src/twm.c b/src/twm.c index 1a6ae95..86e8781 100644 --- a/src/twm.c +++ b/src/twm.c @@ -210,7 +210,7 @@ Bool IsPrintScreen(Screen *s) /*********************************************************************** * * Procedure: - * main - start of twm + * main - start of twmruined * *********************************************************************** */