.gitignore | 1 ChangeLog | 36 + INSTALL | 50 - Makefile.am | 16 Makefile.in | 165 +++--- aclocal.m4 | 1136 +++++++++++++++++++++++++++++++++++--------- config.guess | 34 - config.h.in | 12 config.sub | 36 + configure | 1334 +++++++++++++++++++++++++++++++++++----------------- configure.ac | 19 debian/changelog | 9 debian/control | 8 depcomp | 64 ++ include/Makefile.in | 90 +-- install-sh | 348 ++++++++++--- ltmain.sh | 233 +++++---- missing | 61 +- mkinstalldirs | 5 src/Clip.c | 4 src/CvtStdSel.c | 4 src/Makefile.am | 27 - src/Makefile.in | 182 ++++--- src/StdCmap.c | 4 src/StrToWidg.c | 5 25 files changed, 2792 insertions(+), 1091 deletions(-)
New commits: commit d782f3c377b96a3c73b8adb45a2fbdd42db38fe6 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jan 17 14:57:58 2008 +0100 Prepare changelog for upload. diff --git a/debian/changelog b/debian/changelog index f1a1473..6e093f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxmu (2:1.0.4-1) UNRELEASED; urgency=low +libxmu (2:1.0.4-1) unstable; urgency=low [ Julien Cristau ] * New upstream release. @@ -16,7 +16,7 @@ libxmu (2:1.0.4-1) UNRELEASED; urgency=low [ Timo Aaltonen ] * Bump the epoch so that this can be synced to Ubuntu in the future. - -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jan 2008 14:56:15 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jan 2008 14:57:47 +0100 libxmu (1:1.0.3-1) unstable; urgency=low commit 0bb17de4e41504e36b970ac460bf9f791bb20cdb Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jan 17 14:57:11 2008 +0100 debian/control updates * Add myself to Uploaders, and remove Branden and Fabio with their permission. * Bump Standards-Version to 3.7.3 (no changes). * s/^XS-Vcs/Vcs/ diff --git a/debian/changelog b/debian/changelog index c06d41d..f1a1473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,22 @@ libxmu (2:1.0.4-1) UNRELEASED; urgency=low [ Julien Cristau ] + * New upstream release. * Make libxmu*-dev depend on libxmu-headers (= ${source:Version}). Thanks, Josh Triplett. * Don't export private dependencies in xmu.pc and xmuu.pc. These dependencies are handled by Requires.private. * Due to the above, build-depend on quilt and apply the xsfbs patch rules. * Update xsfbs to the latest version as of 2008-01-06. - * New upstream release. + * Add myself to Uploaders, and remove Branden and Fabio with their + permission. + * Bump Standards-Version to 3.7.3 (no changes). + * s/^XS-Vcs/Vcs/ [ Timo Aaltonen ] * Bump the epoch so that this can be synced to Ubuntu in the future. - -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jan 2008 14:47:13 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jan 2008 14:56:15 +0100 libxmu (1:1.0.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 7037085..d54ccda 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: libxmu Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]> +Uploaders: David Nusinow <[EMAIL PROTECTED]>, Julien Cristau <[EMAIL PROTECTED]> Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxt-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1), pkg-config, quilt -Standards-Version: 3.7.2 -XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu -XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git +Standards-Version: 3.7.3 +Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxmu +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxmu.git Package: libxmu6 Section: libs commit 59120eb7963b49a90d574e28272b701d7e1ec732 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jan 17 14:48:55 2008 +0100 update changelogs for new upstream diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..a295c5b --- /dev/null +++ b/ChangeLog @@ -0,0 +1,272 @@ +commit e2735131202e7801e72ce33def666b6a0a543e26 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Jan 14 14:11:43 2008 -0800 + + Version bump: 1.0.4 + +commit f11b5a161944dc694ee059f88acb20826bd6d90b +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Mon Jan 14 11:21:36 2008 -0800 + + Coverity #52: Dead code in get_os_name() + +commit 6f5ea6a2a0b56674f08f58d95085c0e9a8797fe2 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Sun Jan 13 01:58:12 2008 -0800 + + Clear sparse warnings: Using plain integer as NULL pointer + +commit 6f76ccc70a5f5ae834a3e63c9f4f35704837a4d1 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Fri Jan 11 20:43:26 2008 -0800 + + Add hooks for checking sources with tools like lint & sparse + +commit 43ec402bcd6a2333a4e213de3a82d7e3392b0fb0 +Author: James Cloos <[EMAIL PROTECTED]> +Date: Thu Dec 6 16:38:32 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 7e35135e9ad1ea2ef101402ea26bec62c3cbb69a +Author: James Cloos <[EMAIL PROTECTED]> +Date: Mon Sep 3 05:53:43 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit a3e01af0f4b56b3b8891040cf0f7208265bbea2a +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Wed Nov 8 20:01:35 2006 +0200 + + bump to 1.0.3 + +commit 7beb4c2909af805e61d073a6f2b93234eb91834d +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Fri Oct 13 16:22:06 2006 -0400 + + Bump to 1.0.2 + +commit 339368b404a807d1c494b260314da16d044986ff +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Thu Jul 13 14:59:01 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit 60620a4b7eeb004e55ba57aef8df33f6adc930f0 +Author: Matthias Hopf <[EMAIL PROTECTED]> +Date: Mon Jul 3 19:33:05 2006 +0200 + + Added README missing from CVS conversion. + +commit 05a5c96fcef9822ff3c0312427d2c2672f73b551 +Author: Matthieu Herrb <[EMAIL PROTECTED]> +Date: Sun Apr 30 14:22:53 2006 +0000 + + Define BITMAPDIR for the case where ${prefix} != /usr + +commit 0aa6a46099fb319c82da51b8a73566007ad5acbd +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Thu Apr 27 00:18:38 2006 +0000 + + Bump to 1.0.1 + +commit 7bb6398aa024d782706125bebd93468f9cc8a0ec +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Mon Mar 20 19:57:04 2006 +0000 + + Bug #6276: Fix build on Cygwin. (Yaakov Selkowitz) + +commit 78ab364fec59fa84ac914d51628dfb8ac4a048a5 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Thu Dec 15 00:24:30 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 1d93f5a9968e6e9af8f15c60107b1691009d1bd8 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Dec 3 05:49:44 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 5a807bcce047a8072db2c0cef05a84aa6e6cd3ca +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Sat Nov 19 07:15:42 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 c50ca633b633d25ba672fb19ac182cea40242069 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 19 02:48:11 2005 +0000 + + Update package version number for RC1 release. + +commit 8c5b2278580193578cdd0da8c8e948e74f8a3f26 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Wed Oct 5 19:57:36 2005 +0000 + + Add missing file to EXTRA_DIST + +commit bf4087e453d8fd83630976cd6e7e31c63737a4a1 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Mon Oct 3 20:55:36 2005 +0000 + + Remvoe README file that is symlinked from monolith + +commit 82b5da0b34780df3fe91c4b617cb541ee767d794 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Sat Jul 30 19:15:16 2005 +0000 + + Add -D flags to clear various warnings (Stefan Dirsch) + +commit 43f43567e3c8c63f6b70d7e529827cd5f15e15d3 +Author: Kevin E Martin <[EMAIL PROTECTED]> +Date: Fri Jul 29 21:22:52 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 e9ee49d99a20458e5f36bba48a7ea65bb5230a8d +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sat Jul 16 07:16:27 2005 +0000 + + Set soversions to 6.2.0 and 1.0.0 with -version-number. + +commit 81f5815d0c42b7065eb8e5aeef8e115e7398128f +Author: Keith Packard <[EMAIL PROTECTED]> +Date: Sat Jul 9 06:43:26 2005 +0000 + + Add .cvsignore files + +commit 56ef5803a7def4f0d08ce8863e317b250c9c0ce4 +Author: Daniel Stone <[EMAIL PROTECTED]> +Date: Sun Jul 3 07:00:57 2005 +0000 + + Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. + Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. + Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all + source files in the xserver/xorg tree, predicated on defines of + HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to + <X11/fonts/foo.h>. + +commit 5a64c1de0a1d620039afbb0805ae23f10470e815 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Sun May 22 19:06:20 2005 +0000 + + Add XTRANS_CONNECTION_FLAGS to get network transport #defines for + CvdStdSel.c + Add libXmuu_la_LIBADD + +commit 506a8f64c84b3db3ad64d03ee698c1de227247de +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Sun May 22 04:36:38 2005 +0000 + + Move #ifdef HAVE_CONFIG_H outside of #ifdef SYSVNET + +commit 9ca353477c403ab1341e994a5a42a998d29e9a58 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Thu May 19 00:22:32 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit 0a662934f050cff90e82d463ec809c3758b260b1 +Author: Adam Jackson <[EMAIL PROTECTED]> +Date: Thu May 19 00:10:08 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit 2e403190ff21b0bb277391a73741cfc6d5005ac3 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed May 18 19:38:36 2005 +0000 + + - Add Xmu build system + +commit 7cea083d37cfaaad321bddca0fb75b3308956938 +Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]> +Date: Wed May 18 19:30:41 2005 +0000 + + - Add Xmu to symlink.sh + - Conditionally include config.h in Xmu sources + +commit ab0973b4595cfe27c81202bfb4a148780b05bb02 +Author: Alan Coopersmith <[EMAIL PROTECTED]> +Date: Wed Dec 22 08:28:16 2004 +0000 + + Bug #2123 <https://bugs.freedesktop.org/show_bug.cgi?id=2123> Attachment + #1587 <https://bugs.freedesktop.org/attachment.cgi?id=1587> Call to + uname should not check for return == 0, but for >= 0 instead + +commit ece6cefc8e0238071f89de520d4a969fede53bd6 +Author: Eric Anholt <[EMAIL PROTECTED]> +Date: Tue May 18 04:45:29 2004 +0000 + + Remove Xaw header dependency from Xmu library build. + http://freedesktop.org/cgi-bin/bugzilla/attachment.cgi?bugid=634 + +commit 51156051e17f4ec53cbfe34f3a79f38d5884b78d +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Fri Apr 23 18:43:45 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 832c5a7d7b07b88f6468daabae56d9daeeee0db8 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Sun Mar 14 08:32:24 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 410cf462f4a8733c58303de686f07fbd98f2e30e +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Wed Mar 3 12:11:29 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit b00bc81852e56578939fb4d63796f8e0cd187cbf +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 13:35:33 2004 +0000 + + readding XFree86's cvs IDs + +commit aa59d04a1a50b5978e886c2e7248f77bea515ce0 +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Feb 26 09:22:44 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 0d10732a71487293bd70c2675ced6bffb6093c8d +Author: Egbert Eich <[EMAIL PROTECTED]> +Date: Thu Jan 29 08:08:06 2004 +0000 + + Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 + +commit 6b975651aef1797eb795bd876486c565c52f66fd +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Tue Nov 25 19:28:15 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 865329b4e079334b4cb846347ab9a572ac946228 +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:49 2003 +0000 + + XFree86 4.3.0.1 + +commit 709dda59a506e0c4ad17b085aa381f35cd86176f +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 16:48:49 2003 +0000 + + Initial revision + +commit e3925d3087dc381a24b47c5602e086645e942fcf +Author: Kaleb Keithley <[EMAIL PROTECTED]> +Date: Fri Nov 14 15:54:39 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/debian/changelog b/debian/changelog index 0f20212..c06d41d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxmu (2:1.0.3-2) UNRELEASED; urgency=low +libxmu (2:1.0.4-1) UNRELEASED; urgency=low [ Julien Cristau ] * Make libxmu*-dev depend on libxmu-headers (= ${source:Version}). Thanks, @@ -7,11 +7,12 @@ libxmu (2:1.0.3-2) UNRELEASED; urgency=low dependencies are handled by Requires.private. * Due to the above, build-depend on quilt and apply the xsfbs patch rules. * Update xsfbs to the latest version as of 2008-01-06. + * New upstream release. [ Timo Aaltonen ] * Bump the epoch so that this can be synced to Ubuntu in the future. - -- Julien Cristau <[EMAIL PROTECTED]> Sun, 06 Jan 2008 16:29:36 +0100 + -- Julien Cristau <[EMAIL PROTECTED]> Thu, 17 Jan 2008 14:47:13 +0100 libxmu (1:1.0.3-1) unstable; urgency=low commit dd41e449ccbb8cb616493117100220b51d643e46 Author: Julien Cristau <[EMAIL PROTECTED]> Date: Thu Jan 17 14:47:04 2008 +0100 autoreconf diff --git a/INSTALL b/INSTALL index 23e5f25..5458714 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it. Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -78,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +87,15 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +188,12 @@ them in the `configure' command line, using `VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== diff --git a/Makefile.in b/Makefile.in index 94efc6e..13f907b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This Makefile.in 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. @@ -16,15 +16,11 @@ # $Id$ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -38,19 +34,19 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/xmu.pc.in $(srcdir)/xmuu.pc.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ config.guess config.sub depcomp install-sh ltmain.sh missing \ mkinstalldirs -subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = xmu.pc xmuu.pc @@ -58,10 +54,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -71,6 +68,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgconfigdir)" pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -86,8 +85,6 @@ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -116,6 +113,7 @@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ HAS_SNPRINTF = @HAS_SNPRINTF@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -124,12 +122,15 @@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ +LINT = @LINT@ +LINTLIB = @LINTLIB@ +LINTLIBUU = @LINTLIBUU@ +LINT_FLAGS = @LINT_FLAGS@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -140,6 +141,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -148,13 +150,13 @@ XMUU_CFLAGS = @XMUU_CFLAGS@ XMUU_LIBS = @XMUU_LIBS@ XMU_CFLAGS = @XMU_CFLAGS@ XMU_LIBS = @XMU_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -166,6 +168,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -193,17 +196,17 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ SUBDIRS = include src pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xmu.pc xmuu.pc -EXTRA_DIST = \ - xmu.pc.in \ - xmuu.pc.in \ - autogen.sh \ - include/X11/Xmu/WhitePoint.h - +EXTRA_DIST = xmu.pc.in xmuu.pc.in autogen.sh \ + include/X11/Xmu/WhitePoint.h ChangeLog +MAINTAINERCLEANFILES = ChangeLog all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -245,7 +248,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -271,10 +274,9 @@ clean-libtool: distclean-libtool: -rm -f libtool -uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -321,8 +323,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -424,24 +425,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/include/X11/Xmu - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -455,7 +454,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -463,14 +462,19 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -545,7 +549,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -570,7 +574,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -596,6 +600,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -618,12 +623,20 @@ info-am: install-data-am: install-pkgconfigDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -644,27 +657,39 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-pkgconfigDATA - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-recursive distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ - install-pkgconfigDATA install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-libtool \ - mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-info-am \ +uninstall-am: uninstall-pkgconfigDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ uninstall-pkgconfigDATA + +.PHONY: ChangeLog + +ChangeLog: + (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + +dist-hook: ChangeLog + +# Check source code with tools like lint & sparse [EMAIL PROTECTED]@lint: [EMAIL PROTECTED]@ (cd src && $(MAKE) $(MFLAGS) lint) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/aclocal.m4 b/aclocal.m4 index f18ffa3..680a06e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006 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. @@ -11,9 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL +# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -176,7 +181,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -263,8 +268,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -276,8 +282,9 @@ $rm conftest* # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -293,12 +300,20 @@ $rm conftest* # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]