diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
| commit | dc54712d6b67dac7fc745cf3b9019b2c4c81f193 (patch) | |
| tree | 002b3fd0e0233fe3e6c57d603a8471794f5ba922 /xkbcomp | |
| parent | ca14143b18b939ee4506936e77478f8c593802b5 (diff) | |
| parent | a0a46bd55d7cbbf70757a29c067e21b70ac4e2df (diff) | |
| download | vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.gz vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.bz2 vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index 07822fe58..9ac84f682 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -32,7 +32,7 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
# If both the C file and YACC are missing, the package cannot be build.
AC_PROG_YACC
@@ -49,7 +49,7 @@ AC_CHECK_FUNCS([strdup strcasecmp]) PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile)
AC_ARG_WITH([xkb_config_root],
- [AC_HELP_STRING([--with-xkb-config-root=<paths>],
+ [AS_HELP_STRING([--with-xkb-config-root=<paths>],
[Set default XKB config root (default: ${datadir}/X11/xkb)])],
[XKBCONFIGROOT="$withval"],
[XKBCONFIGROOT='${datadir}/X11/xkb'])
|