diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 18:58:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 18:58:20 +0000 |
| commit | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (patch) | |
| tree | d25ddcc9b5bb33bef4832bd6e8702061a9887a53 /xkbcomp/configure.ac | |
| parent | e445df175688f07d599649591c990d432375c67e (diff) | |
| parent | dc3c299dd0995549e2a6973ca0f25b254afd38a5 (diff) | |
| download | vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.gz vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.tar.bz2 vcxsrv-e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xkbcomp/configure.ac')
| -rw-r--r-- | xkbcomp/configure.ac | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 2f3468fbb..4d55b6b36 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -21,22 +21,39 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xkbcomp,[1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp) +AC_INIT(xkbcomp,[1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xkbcomp) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) + AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_YACC AC_PROG_INSTALL +XORG_CWARNFLAGS + +AC_CHECK_FUNCS([strdup strcasecmp]) + # Checks for pkg-config packages PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile) +XKBCOMP_CFLAGS="$CWARNFLAGS $XKBCOMP_CFLAGS" AC_SUBST(XKBCOMP_CFLAGS) AC_SUBST(XKBCOMP_LIBS) +AC_ARG_WITH([xkb_config_root], + [AC_HELP_STRING([--with-xkb-config-root=<paths>], + [Set default XKB config root (default: ${datadir}/X11/xkb)])], + [XKBCONFIGROOT="$withval"], + [XKBCONFIGROOT='${datadir}/X11/xkb']) +AC_SUBST([XKBCONFIGROOT]) + XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |