diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
| commit | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (patch) | |
| tree | a6a1cf67169f65d2b680c6d3f548d45901284aff /xkbcomp | |
| parent | 6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff) | |
| download | vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.gz vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.bz2 vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.zip | |
xserver xkbcomp libxcb pixman git update 24/9/2010
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/Makefile.am | 22 | ||||
| -rw-r--r-- | xkbcomp/configure.ac | 12 |
2 files changed, 6 insertions, 28 deletions
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am index 31c78e023..3ef361dbd 100644 --- a/xkbcomp/Makefile.am +++ b/xkbcomp/Makefile.am @@ -76,29 +76,11 @@ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) EXTRA_DIST += $(appman_PRE)
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
-
SUFFIXES = .$(APP_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(APP_MAN_SUFFIX):
- sed $(MAN_SUBSTS) < $< > $@
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.PHONY: ChangeLog INSTALL
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index c4d2dc735..0eb8d88d9 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -20,33 +20,29 @@ dnl PERFORMANCE OF THIS SOFTWARE. dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT(xkbcomp,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
AC_PROG_YACC
AC_PATH_PROG([YACC_INST], $YACC)
AC_CHECK_FILE([$srcdir/xkbparse.c], [],
[test -z "$YACC_INST" && AC_MSG_ERROR([yacc not found - unable to compile xkbparse.y])])
-AC_PROG_INSTALL
AC_CHECK_FUNCS([strdup strcasecmp])
# Checks for pkg-config packages
PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
-AC_SUBST(XKBCOMP_CFLAGS)
-AC_SUBST(XKBCOMP_LIBS)
AC_ARG_WITH([xkb_config_root],
[AC_HELP_STRING([--with-xkb-config-root=<paths>],
|