diff options
author | Keith Packard <keithp@keithp.com> | 2011-06-22 11:03:37 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-06-22 11:03:37 -0700 |
commit | 8ac651552bb70ba36238f430adab2f7a7f24db6e (patch) | |
tree | d9b8eed7d66536490b4332146c26ed382415ee31 /configure.ac | |
parent | 945b2ff8141c58344fc9558ee3853fad3e86134b (diff) | |
parent | 47b6ba3204d650393a7255ce2af27b8c018bb586 (diff) |
Merge remote-tracking branch 'alanc/master'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 145e4c32c..a53ab5038 100644 --- a/configure.ac +++ b/configure.ac @@ -1203,6 +1203,11 @@ AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model]) AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout]) AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant]) AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options]) +AC_SUBST([XKB_DFLT_RULES]) +AC_SUBST([XKB_DFLT_MODEL]) +AC_SUBST([XKB_DFLT_LAYOUT]) +AC_SUBST([XKB_DFLT_VARIANT]) +AC_SUBST([XKB_DFLT_OPTIONS]) XKB_LIB='$(top_builddir)/xkb/libxkb.la' XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' |