x11-xkb-utils: Changes to 'debian-unstable'
debian/changelog | 11
debian/control | 2
debian/rules | 5
setxkbmap/ChangeLog | 306 ++
setxkbmap/Makefile.am | 20
setxkbmap/Makefile.in | 299 +-
setxkbmap/aclocal.m4 | 1168 ++++++--
setxkbmap/config.guess | 18
setxkbmap/config.sub | 76
setxkbmap/configure | 5873 +++++++++++++++++++++++++++++++++++++++++
setxkbmap/configure.ac | 11
setxkbmap/man/Makefile.am | 14
setxkbmap/man/Makefile.in | 418 ++
setxkbmap/man/setxkbmap.man | 141 +
setxkbmap/setxkbmap.c | 668 ++--
setxkbmap/setxkbmap.man | 139
xkbcomp/ChangeLog | 147 +
xkbcomp/Makefile.am | 3
xkbcomp/Makefile.in | 79
xkbcomp/aclocal.m4 | 5107 +++++++++++++++++++-----------------
xkbcomp/alias.c | 10
xkbcomp/compat.c | 6
xkbcomp/config.guess | 218 -
xkbcomp/config.sub | 103
xkbcomp/configure | 6118 ++++++++++++++++++++++++++++++++++++++++++-
xkbcomp/configure.ac | 10
xkbcomp/geometry.c | 10
xkbcomp/man/Makefile.in | 4
xkbcomp/man/xkbcomp.man | 3
xkbcomp/parseutils.c | 4
xkbcomp/symbols.c | 6
xkbcomp/utils.h | 4
xkbcomp/xkbcomp.c | 21
xkbcomp/xkbcomp.pc.in | 9
xkbcomp/xkbparse.c | 663 +---
xkbcomp/xkbscan.c | 6
xkbevd/ChangeLog | 87
xkbevd/Makefile.am | 27
xkbevd/Makefile.in | 310 +-
xkbevd/aclocal.m4 | 1044 ++++++-
xkbevd/cfgparse.c | 77
xkbevd/cfgparse.y | 9
xkbevd/cfgscan.c | 6
xkbevd/config.h.in | 3
xkbevd/configure | 6178 ++++++++++++++++++++++++++++++++++++++++++--
xkbevd/configure.ac | 9
xkbevd/man/Makefile.am | 12
xkbevd/man/Makefile.in | 417 ++
xkbevd/man/xkbevd.man | 96
xkbevd/printev.c | 6
xkbevd/utils.c | 85
xkbevd/utils.h | 55
xkbevd/xkbevd.c | 26
xkbevd/xkbevd.h | 2
xkbevd/xkbevd.man | 96
55 files changed, 25219 insertions(+), 5026 deletions(-)
New commits:
commit 0cec6d0310fab5531dd53a34b9e64f8b84052613
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 20:40:17 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index a7f11cb..722750f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
+x11-xkb-utils (7.7~1) unstable; urgency=low
* setxkbmap 1.3 0
* xkbcomp 1.2.4
@@ -7,7 +7,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
* Bump x11proto-core-dev build-dep to 7.0.17.
* Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.
- -- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 20:24:08 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 20:40:11 +0200
x11-xkb-utils (7.6+4) unstable; urgency=low
commit 62bd68d1e4d89b533d87f05da4dd50bc80a4d360
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 20:40:06 2012 +0200
Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.
diff --git a/debian/changelog b/debian/changelog
index b355768..a7f11cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
* Don't use dh_testroot in debian/rules clean.
* xkbevd 1.1.3
* Bump x11proto-core-dev build-dep to 7.0.17.
+ * Tell dh_install to ignore xkbcomp.pc, nothing uses that AFAIK.
-- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 20:24:08 +0200
diff --git a/debian/rules b/debian/rules
index 9f53a93..dc630bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -82,7 +82,7 @@ binary-arch: build install
dh_testroot
dh_installdocs
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --sourcedir=debian/tmp --fail-missing -Xxkbcomp.pc
install -m 644 xkbevd/example.cf \
debian/x11-xkb-utils/usr/share/doc/x11-xkb-utils/xkbevd-example.cf
dh_installchangelogs
commit e55ec112ba582dbcd96a28c7b74eaf60f539873a
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 20:31:31 2012 +0200
Bump x11proto-core-dev build-dep to 7.0.17.
diff --git a/debian/changelog b/debian/changelog
index a9e6e99..b355768 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
* xkbcomp 1.2.4
* Don't use dh_testroot in debian/rules clean.
* xkbevd 1.1.3
+ * Bump x11proto-core-dev build-dep to 7.0.17.
-- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 20:24:08 +0200
diff --git a/debian/control b/debian/control
index 320a808..736f882 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
bison,
quilt,
xutils-dev (>= 1:7.5+4),
- x11proto-core-dev,
+ x11proto-core-dev (>= 7.0.17),
# Reasons for build-depends:
# debhelper for the packaging, pkg-config needed by configure scripts
# Individual apps:
commit bb4ec11b9890325aaab1f26c4f22e43023d86ea3
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 30 20:28:17 2012 +0200
xkbevd 1.1.3
diff --git a/debian/changelog b/debian/changelog
index 48f39be..a9e6e99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11-xkb-utils (7.7~1) UNRELEASED; urgency=low
* setxkbmap 1.3 0
* xkbcomp 1.2.4
* Don't use dh_testroot in debian/rules clean.
+ * xkbevd 1.1.3
-- Julien Cristau <jcristau@debian.org> Mon, 30 Apr 2012 20:24:08 +0200
diff --git a/xkbevd/ChangeLog b/xkbevd/ChangeLog
index e030694..5a1cf76 100644
--- a/xkbevd/ChangeLog
+++ b/xkbevd/ChangeLog
@@ -1,3 +1,90 @@
+commit 34557c33a9711f15f771599f5320ab8f01f0d117
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 22 22:39:25 2012 -0700
+
+ xkbevd 1.1.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b2d40b9a09ab40482e081a2648cf8f79ff6cc386
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 27 11:06:06 2011 -0800
+
+ Delete unused uFatalError function
+
+ Stops gcc from suggesting to add noreturn attribute to it.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit b71eb0361cf556909d88b59ccdb810a137c1efeb
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 27 11:00:58 2011 -0800
+
+ Fix gcc -Wwrite-strings warnings
+
+ except for those caused by code generated by bison/yacc
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6ad0af956bbc328c91fdb2327b43614c7ebbb000
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 27 10:50:59 2011 -0800
+
+ Replace local u*alloc wrappers with direct calls to standard funcs
+
+ Includes:
+ - Replacing calls to uTypedCalloc with direct calloc calls
+ - Replacing uFree calls with free calls
+ - Assuming strdup is always available and uStringDup fallback function
+ is no longer needed
+ - Deleting the remainder of the forms of u*alloc which were unused
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e5c801fbd2f8341e67600fd38b1f3ef8fc82030f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 27 10:40:10 2011 -0800
+
+ Check for strdup & strcasecmp in configure before defining our own
+
+ The HAVE_STRDUP & HAVE_STRCASECMP checks were already in the code,
+ just not the configure checks to define them or the #include "config.h"
+ to find the definitions.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c6c878fa6985a84181ebd44abc9de6aa74268024
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Mar 8 08:20:10 2011 -0500
+
+ config: move pre-processor flags to AM_CPPFLAGS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 433364d960bea9fa458c2f144c2033300019b0fa
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Mar 8 08:18:19 2011 -0500
+
+ config: let Automake handle Yacc dist and cleaning
+
+ BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake.
+
+ Automake generates all the rules to handle building,
+ distribution and cleaning.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e7c5c1018964e5213d1bf727ebfd90e95dbca6a2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jan 19 10:06:56 2011 -0500
+
+ config: move man pages into their own directory
+
+ Use services provided by XORG_MANPAGE_SECTIONS.
+ Use standard Makefile for man pages.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 95987d19b9802c235f2257eceff663a4a1e286fa
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 8 21:51:11 2010 -0800
diff --git a/xkbevd/Makefile.am b/xkbevd/Makefile.am
index 949411a..895468f 100644
--- a/xkbevd/Makefile.am
+++ b/xkbevd/Makefile.am
@@ -18,10 +18,12 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+SUBDIRS = man
bin_PROGRAMS = xkbevd
-AM_CFLAGS = $(CWARNFLAGS) $(XKBEVD_CFLAGS) \
- -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
+AM_CPPFLAGS = -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
+AM_CFLAGS = $(CWARNFLAGS) $(XKBEVD_CFLAGS)
+
xkbevd_LDADD = $(XKBEVD_LIBS)
xkbevd_SOURCES = \
@@ -35,29 +37,10 @@ xkbevd_SOURCES = \
xkbevd.c \
xkbevd.h
-appman_PRE = \
- xkbevd.man
-
-BUILT_SOURCES = cfgparse.c
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-MAINTAINERCLEANFILES += $(BUILT_SOURCES)
-
# Sample configuration files
EXTRA_DIST = example.cf xkbevd.cf
-appmandir = $(APP_MAN_DIR)
-
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES = $(appman_DATA)
-
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-
+MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
diff --git a/xkbevd/Makefile.in b/xkbevd/Makefile.in
index 0f4ce5b..2256bd6 100644
--- a/xkbevd/Makefile.in
+++ b/xkbevd/Makefile.in
@@ -35,7 +35,6 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -71,7 +70,7 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_xkbevd_OBJECTS = cfgparse.$(OBJEXT) cfgscan.$(OBJEXT) \
evargs.$(OBJEXT) printev.$(OBJEXT) utils.$(OBJEXT) \
@@ -107,30 +106,21 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(xkbevd_SOURCES)
DIST_SOURCES = $(xkbevd_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-DATA = $(appman_DATA)
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-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
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -138,6 +128,31 @@ am__remove_distdir = \
{ test ! -d "$(distdir)" \
|| { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
&& rm -fr "$(distdir)"; }; }
+am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ done; \
+ reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
@@ -153,6 +168,7 @@ AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BASE_CFLAGS = @BASE_CFLAGS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
@@ -204,6 +220,7 @@ PKG_CONFIG = @PKG_CONFIG@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STRICT_CFLAGS = @STRICT_CFLAGS@
STRIP = @STRIP@
VERSION = @VERSION@
XKBEVD_CFLAGS = @XKBEVD_CFLAGS@
@@ -262,9 +279,9 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CFLAGS = $(CWARNFLAGS) $(XKBEVD_CFLAGS) \
- -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
-
+SUBDIRS = man
+AM_CPPFLAGS = -DDFLT_XKB_CONFIG_ROOT='"$(datadir)/X11/xkb"'
+AM_CFLAGS = $(CWARNFLAGS) $(XKBEVD_CFLAGS)
xkbevd_LDADD = $(XKBEVD_LIBS)
xkbevd_SOURCES = \
cfgparse.y \
@@ -277,23 +294,15 @@ xkbevd_SOURCES = \
xkbevd.c \
xkbevd.h
-appman_PRE = \
- xkbevd.man
-
-BUILT_SOURCES = cfgparse.c
-MAINTAINERCLEANFILES = ChangeLog INSTALL $(BUILT_SOURCES)
# Sample configuration files
-EXTRA_DIST = example.cf xkbevd.cf $(appman_PRE)
-appmandir = $(APP_MAN_DIR)
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-CLEANFILES = $(appman_DATA)
-SUFFIXES = .$(APP_MAN_SUFFIX) .man
-all: $(BUILT_SOURCES) config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+EXTRA_DIST = example.cf xkbevd.cf
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
.SUFFIXES:
-.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj .y
+.SUFFIXES: .c .o .obj .y
am--refresh:
@:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -417,26 +426,76 @@ distclean-compile:
.y.c:
$(AM_V_YACC)$(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE)
-install-appmanDATA: $(appman_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(appmandir)" || $(MKDIR_P) "$(DESTDIR)$(appmandir)"
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appmandir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(appmandir)" || exit $$?; \
- done
-uninstall-appmanDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(appmandir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(appmandir)" && rm -f $$files
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -448,10 +507,23 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
@@ -470,7 +542,7 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
fi; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -522,6 +594,34 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ fi; \
+ done
+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+ $(am__relativize); \
+ new_distdir=$$reldir; \
+ dir1=$$subdir; dir2="$(top_distdir)"; \
+ $(am__relativize); \
+ new_top_distdir=$$reldir; \
+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$new_top_distdir" \
+ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
+ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
@@ -641,23 +741,22 @@ distcleancheck: distclean
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(PROGRAMS) $(DATA) config.h
-installdirs:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"; do \
+check: check-recursive
+all-am: Makefile $(PROGRAMS) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -666,7 +765,6 @@ install-strip:
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -676,103 +774,99 @@ maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-rm -f cfgparse.c
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
html-am:
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-appmanDATA
+install-data-am:
-install-dvi: install-dvi-am
+install-dvi: install-dvi-recursive
install-dvi-am:
install-exec-am: install-binPROGRAMS
-install-html: install-html-am
+install-html: install-html-recursive
install-html-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-info-am:
install-man:
-install-pdf: install-pdf-am
+install-pdf: install-pdf-recursive
install-pdf-am:
-install-ps: install-ps-am
+install-ps: install-ps-recursive
install-ps-am:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-compile mostlyclean-generic
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
-uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS
-.MAKE: all check install install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
- clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-binPROGRAMS \
+ clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
dist-zip distcheck distclean distclean-compile \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-appmanDATA \
- install-binPROGRAMS 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-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-appmanDATA \
- uninstall-binPROGRAMS
-
-
-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
-.man.$(APP_MAN_SUFFIX):
- $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+ info-am install install-am install-binPROGRAMS 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-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-binPROGRAMS
+
.PHONY: ChangeLog INSTALL
diff --git a/xkbevd/aclocal.m4 b/xkbevd/aclocal.m4
index b2cf5c5..464110b 100644
--- a/xkbevd/aclocal.m4
+++ b/xkbevd/aclocal.m4
@@ -1016,6 +1016,162 @@ 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 <scott@netsplit.com>.
+#
+# 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])
+# ----------------------------------
+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
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]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
+# --------------------------------------------------------------
+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_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+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_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]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
+#
+#
+# --------------------------------------------------------------
+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
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+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
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$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
+[Package requirements ($2) were not met:
+
+$$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])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[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 <http://pkg-config.freedesktop.org/>.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
@@ -1055,7 +1211,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.11.0])
+m4_define([vers_have], [1.17])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1082,7 +1238,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
# which is not the best choice for supporting other OS'es, but covers most
# of the ones we need for now.
AC_MSG_CHECKING([if $RAWCPP requires -undef])
-AC_LANG_CONFTEST([Does cpp redefine unix ?])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
AC_MSG_RESULT([no])
else
@@ -1100,7 +1256,7 @@ fi
rm -f conftest.$ac_ext
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
-AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])])
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
Reply to: