Update to xkeyboard-config 2.17
ok matthieu@
This commit is contained in:
shadchin
parent
52cd6d30b8
commit
32b79642ee
@ -1,11 +1,11 @@
|
|||||||
# $OpenBSD: Makefile,v 1.4 2013/10/26 17:49:57 shadchin Exp $
|
# $OpenBSD: Makefile,v 1.5 2016/02/06 17:50:06 shadchin Exp $
|
||||||
|
|
||||||
SUBDIR= digital_vndr sgi_vndr
|
SUBDIR= digital_vndr sgi_vndr
|
||||||
|
|
||||||
XKB_SUBDIR= keycodes
|
XKB_SUBDIR= keycodes
|
||||||
|
|
||||||
DATA= aliases amiga ataritt empty evdev fujitsu hp ibm macintosh olpc sony \
|
DATA= aliases amiga ataritt empty evdev fujitsu hp ibm jolla macintosh olpc \
|
||||||
sun xfree86 xfree98 README
|
sony sun xfree86 xfree98 README
|
||||||
|
|
||||||
.include <bsd.xorg.mk>
|
.include <bsd.xorg.mk>
|
||||||
.include <bsd.subdir.mk>
|
.include <bsd.subdir.mk>
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
|
.\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
|
||||||
.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.16" "X Version 11"
|
.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.17" "X Version 11"
|
||||||
.SH NAME
|
.SH NAME
|
||||||
xkeyboard-config \- XKB data description files
|
xkeyboard-config \- XKB data description files
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
@ -339,6 +339,7 @@ br(dvorak) Portuguese (Brazil, Dvorak)
|
|||||||
br(nativo) Portuguese (Brazil, Nativo)
|
br(nativo) Portuguese (Brazil, Nativo)
|
||||||
br(nativo-us) Portuguese (Brazil, Nativo for US keyboards)
|
br(nativo-us) Portuguese (Brazil, Nativo for US keyboards)
|
||||||
br(nativo-epo) Esperanto (Brazil, Nativo)
|
br(nativo-epo) Esperanto (Brazil, Nativo)
|
||||||
|
br(thinkpad) Portuguese (Brazil, IBM/Lenovo ThinkPad)
|
||||||
|
|
||||||
_
|
_
|
||||||
bg Bulgarian
|
bg Bulgarian
|
||||||
@ -466,6 +467,7 @@ fr(bepo) French (Bepo, ergonomic, Dvorak way)
|
|||||||
fr(bepo_latin9) French (Bepo, ergonomic, Dvorak way, Latin-9 only)
|
fr(bepo_latin9) French (Bepo, ergonomic, Dvorak way, Latin-9 only)
|
||||||
fr(dvorak) French (Dvorak)
|
fr(dvorak) French (Dvorak)
|
||||||
fr(mac) French (Macintosh)
|
fr(mac) French (Macintosh)
|
||||||
|
fr(azerty) French (Azerty)
|
||||||
fr(bre) French (Breton)
|
fr(bre) French (Breton)
|
||||||
fr(oci) Occitan
|
fr(oci) Occitan
|
||||||
fr(geo) Georgian (France, AZERTY Tskapo)
|
fr(geo) Georgian (France, AZERTY Tskapo)
|
||||||
@ -887,6 +889,9 @@ ml(us-intl) English (Mali, US international)
|
|||||||
_
|
_
|
||||||
tz Swahili (Tanzania)
|
tz Swahili (Tanzania)
|
||||||
|
|
||||||
|
_
|
||||||
|
tg French (Togo)
|
||||||
|
|
||||||
_
|
_
|
||||||
ke Swahili (Kenya)
|
ke Swahili (Kenya)
|
||||||
ke(kik) Kikuyu
|
ke(kik) Kikuyu
|
||||||
@ -1096,6 +1101,7 @@ caps:escape Make Caps Lock an additional ESC
|
|||||||
caps:backspace Make Caps Lock an additional Backspace
|
caps:backspace Make Caps Lock an additional Backspace
|
||||||
caps:super Make Caps Lock an additional Super
|
caps:super Make Caps Lock an additional Super
|
||||||
caps:hyper Make Caps Lock an additional Hyper
|
caps:hyper Make Caps Lock an additional Hyper
|
||||||
|
caps:menu Make Caps Lock an additional Menu key
|
||||||
caps:shiftlock Caps Lock toggles ShiftLock (affects all keys)
|
caps:shiftlock Caps Lock toggles ShiftLock (affects all keys)
|
||||||
caps:none Caps Lock is disabled
|
caps:none Caps Lock is disabled
|
||||||
caps:ctrl_modifier Make Caps Lock an additional Ctrl
|
caps:ctrl_modifier Make Caps Lock an additional Ctrl
|
||||||
@ -1123,6 +1129,7 @@ altwin:hyper_win Hyper is mapped to Win keys
|
|||||||
altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
|
altwin:alt_super_win Alt is mapped to Right Win, Super to Menu
|
||||||
altwin:swap_lalt_lwin Left Alt is swapped with Left Win
|
altwin:swap_lalt_lwin Left Alt is swapped with Left Win
|
||||||
altwin:swap_alt_win Alt is swapped with Win
|
altwin:swap_alt_win Alt is swapped with Win
|
||||||
|
altwin:prtsc_rwin Win is mapped to PrtSc (and the usual Win key)
|
||||||
|
|
||||||
.TE
|
.TE
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
# $OpenBSD: Makefile,v 1.6 2015/11/14 15:30:01 shadchin Exp $
|
# $OpenBSD: Makefile,v 1.7 2016/02/06 17:50:06 shadchin Exp $
|
||||||
|
|
||||||
XKC_TOP = ../../..
|
XKC_TOP = ../../..
|
||||||
PACKAGE_VERSION = 2.16
|
PACKAGE_VERSION = 2.17
|
||||||
PKGCONFIG = xkeyboard-config.pc
|
PKGCONFIG = xkeyboard-config.pc
|
||||||
EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
|
EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
|
||||||
-e 's,@xkb_base@,${XKB_BASE},g'
|
-e 's,@xkb_base@,${XKB_BASE},g'
|
||||||
|
|||||||
@ -1,14 +1,15 @@
|
|||||||
# $OpenBSD: Makefile,v 1.11 2014/09/17 16:11:50 shadchin Exp $
|
# $OpenBSD: Makefile,v 1.12 2016/02/06 17:50:06 shadchin Exp $
|
||||||
|
|
||||||
SUBDIR= digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
|
SUBDIR= digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr \
|
||||||
nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr xfree68_vndr
|
nec_vndr nokia_vndr sgi_vndr sharp_vndr sony_vndr sun_vndr \
|
||||||
|
xfree68_vndr
|
||||||
|
|
||||||
XKB_SUBDIR= symbols
|
XKB_SUBDIR= symbols
|
||||||
|
|
||||||
DATA= af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cm cn \
|
DATA= af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cm cn \
|
||||||
cz de dk ee es et eu epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir \
|
cz de dk ee es et eu epo fi fo fr gb ge gh gn gr hr hu ie il in iq ir \
|
||||||
is it jp ke kg kh kr kz la latam latin lk lt lv ma mao md me mk ml mm \
|
is it jp ke kg kh kr kz la latam latin lk lt lv ma mao md me mk ml mm \
|
||||||
mn mt mv ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy th \
|
mn mt mv ng nl no np pc ph pk pl pt ro rs ru se si sk sn sy tg th \
|
||||||
terminate tj tm tw tr tz ua us uz vn za altwin capslock compose ctrl \
|
terminate tj tm tw tr tz ua us uz vn za altwin capslock compose ctrl \
|
||||||
empty eurosign rupeesign group inet keypad kpdl level3 level5 nbsp \
|
empty eurosign rupeesign group inet keypad kpdl level3 level5 nbsp \
|
||||||
olpc shift srvr_ctrl typo
|
olpc shift srvr_ctrl typo
|
||||||
|
|||||||
7
data/xkeyboard-config/symbols/jolla_vndr/Makefile
Normal file
7
data/xkeyboard-config/symbols/jolla_vndr/Makefile
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# $OpenBSD: Makefile,v 1.1 2016/02/06 17:50:06 shadchin Exp $
|
||||||
|
|
||||||
|
XKB_SUBDIR= symbols/jolla_vndr
|
||||||
|
|
||||||
|
DATA= sbj
|
||||||
|
|
||||||
|
.include <bsd.xorg.mk>
|
||||||
2
dist/xkeyboard-config/NEWS
vendored
2
dist/xkeyboard-config/NEWS
vendored
@ -1,3 +1,5 @@
|
|||||||
|
2.17 13 bugs fixed
|
||||||
|
Translations updated
|
||||||
2.16 10 bugs fixed
|
2.16 10 bugs fixed
|
||||||
Translations updated
|
Translations updated
|
||||||
2.15 7 bugs fixed
|
2.15 7 bugs fixed
|
||||||
|
|||||||
23
dist/xkeyboard-config/configure
vendored
23
dist/xkeyboard-config/configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.16.
|
# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.17.
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||||
@ -577,8 +577,8 @@ MAKEFLAGS=
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='xkeyboard-config'
|
PACKAGE_NAME='xkeyboard-config'
|
||||||
PACKAGE_TARNAME='xkeyboard-config'
|
PACKAGE_TARNAME='xkeyboard-config'
|
||||||
PACKAGE_VERSION='2.16'
|
PACKAGE_VERSION='2.17'
|
||||||
PACKAGE_STRING='xkeyboard-config 2.16'
|
PACKAGE_STRING='xkeyboard-config 2.17'
|
||||||
PACKAGE_BUGREPORT=''
|
PACKAGE_BUGREPORT=''
|
||||||
PACKAGE_URL=''
|
PACKAGE_URL=''
|
||||||
|
|
||||||
@ -1333,7 +1333,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# Omit some internal or obsolete options to make the list less imposing.
|
||||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures xkeyboard-config 2.16 to adapt to many kinds of systems.
|
\`configure' configures xkeyboard-config 2.17 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1404,7 +1404,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of xkeyboard-config 2.16:";;
|
short | recursive ) echo "Configuration of xkeyboard-config 2.17:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1523,7 +1523,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
xkeyboard-config configure 2.16
|
xkeyboard-config configure 2.17
|
||||||
generated by GNU Autoconf 2.69
|
generated by GNU Autoconf 2.69
|
||||||
|
|
||||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||||
@ -1703,7 +1703,7 @@ cat >config.log <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by xkeyboard-config $as_me 2.16, which was
|
It was created by xkeyboard-config $as_me 2.17, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -2568,7 +2568,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='xkeyboard-config'
|
PACKAGE='xkeyboard-config'
|
||||||
VERSION='2.16'
|
VERSION='2.17'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -7259,7 +7259,7 @@ ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr gl hr hu id it ja ka
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile"
|
ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/jolla_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/nokia_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sharp_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.pc docs/Makefile man/Makefile"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
# This file is a shell script that caches the results of configure
|
# This file is a shell script that caches the results of configure
|
||||||
@ -7847,7 +7847,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by xkeyboard-config $as_me 2.16, which was
|
This file was extended by xkeyboard-config $as_me 2.17, which was
|
||||||
generated by GNU Autoconf 2.69. Invocation command line was
|
generated by GNU Autoconf 2.69. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -7904,7 +7904,7 @@ _ACEOF
|
|||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
xkeyboard-config config.status 2.16
|
xkeyboard-config config.status 2.17
|
||||||
configured by $0, generated by GNU Autoconf 2.69,
|
configured by $0, generated by GNU Autoconf 2.69,
|
||||||
with options \\"\$ac_cs_config\\"
|
with options \\"\$ac_cs_config\\"
|
||||||
|
|
||||||
@ -8047,6 +8047,7 @@ do
|
|||||||
"symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;;
|
"symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;;
|
||||||
"symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;;
|
"symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;;
|
||||||
"symbols/hp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/hp_vndr/Makefile" ;;
|
"symbols/hp_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/hp_vndr/Makefile" ;;
|
||||||
|
"symbols/jolla_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/jolla_vndr/Makefile" ;;
|
||||||
"symbols/macintosh_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/macintosh_vndr/Makefile" ;;
|
"symbols/macintosh_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/macintosh_vndr/Makefile" ;;
|
||||||
"symbols/nec_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nec_vndr/Makefile" ;;
|
"symbols/nec_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nec_vndr/Makefile" ;;
|
||||||
"symbols/nokia_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nokia_vndr/Makefile" ;;
|
"symbols/nokia_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/nokia_vndr/Makefile" ;;
|
||||||
|
|||||||
3
dist/xkeyboard-config/configure.ac
vendored
3
dist/xkeyboard-config/configure.ac
vendored
@ -1,4 +1,4 @@
|
|||||||
AC_INIT(xkeyboard-config, 2.16)
|
AC_INIT(xkeyboard-config, 2.17)
|
||||||
AC_CONFIG_SRCDIR(rules/base.xml.in)
|
AC_CONFIG_SRCDIR(rules/base.xml.in)
|
||||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
@ -93,6 +93,7 @@ symbols/Makefile
|
|||||||
symbols/digital_vndr/Makefile
|
symbols/digital_vndr/Makefile
|
||||||
symbols/fujitsu_vndr/Makefile
|
symbols/fujitsu_vndr/Makefile
|
||||||
symbols/hp_vndr/Makefile
|
symbols/hp_vndr/Makefile
|
||||||
|
symbols/jolla_vndr/Makefile
|
||||||
symbols/macintosh_vndr/Makefile
|
symbols/macintosh_vndr/Makefile
|
||||||
symbols/nec_vndr/Makefile
|
symbols/nec_vndr/Makefile
|
||||||
symbols/nokia_vndr/Makefile
|
symbols/nokia_vndr/Makefile
|
||||||
|
|||||||
1
dist/xkeyboard-config/keycodes/Makefile.am
vendored
1
dist/xkeyboard-config/keycodes/Makefile.am
vendored
@ -11,6 +11,7 @@ evdev \
|
|||||||
fujitsu \
|
fujitsu \
|
||||||
hp \
|
hp \
|
||||||
ibm \
|
ibm \
|
||||||
|
jolla \
|
||||||
macintosh \
|
macintosh \
|
||||||
olpc \
|
olpc \
|
||||||
sony \
|
sony \
|
||||||
|
|||||||
1
dist/xkeyboard-config/keycodes/Makefile.in
vendored
1
dist/xkeyboard-config/keycodes/Makefile.in
vendored
@ -372,6 +372,7 @@ evdev \
|
|||||||
fujitsu \
|
fujitsu \
|
||||||
hp \
|
hp \
|
||||||
ibm \
|
ibm \
|
||||||
|
jolla \
|
||||||
macintosh \
|
macintosh \
|
||||||
olpc \
|
olpc \
|
||||||
sony \
|
sony \
|
||||||
|
|||||||
10
dist/xkeyboard-config/keycodes/jolla
vendored
Normal file
10
dist/xkeyboard-config/keycodes/jolla
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
default
|
||||||
|
xkb_keycodes "jolla" {
|
||||||
|
|
||||||
|
// These keycodes are beyond the X11 255 limit value so it would
|
||||||
|
// only be valid for the use with SW which supports extended keycodes,
|
||||||
|
// like xkbcommon.
|
||||||
|
|
||||||
|
<I264> = 264; // Jolla phone has the wired headset button sending this keycode
|
||||||
|
|
||||||
|
};
|
||||||
383
dist/xkeyboard-config/m4/gettext.m4
vendored
Normal file
383
dist/xkeyboard-config/m4/gettext.m4
vendored
Normal file
@ -0,0 +1,383 @@
|
|||||||
|
# gettext.m4 serial 63 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
dnl This file can can be used in projects which are not available under
|
||||||
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
|
dnl License but which still want to provide support for the GNU gettext
|
||||||
|
dnl functionality.
|
||||||
|
dnl Please note that the actual code of the GNU gettext library is covered
|
||||||
|
dnl by the GNU Library General Public License, and the rest of the GNU
|
||||||
|
dnl gettext package package is covered by the GNU General Public License.
|
||||||
|
dnl They are *not* in the public domain.
|
||||||
|
|
||||||
|
dnl Authors:
|
||||||
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
||||||
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
|
||||||
|
|
||||||
|
dnl Macro to add for using GNU gettext.
|
||||||
|
|
||||||
|
dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
|
||||||
|
dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
|
||||||
|
dnl default (if it is not specified or empty) is 'no-libtool'.
|
||||||
|
dnl INTLSYMBOL should be 'external' for packages with no intl directory,
|
||||||
|
dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
|
||||||
|
dnl If INTLSYMBOL is 'use-libtool', then a libtool library
|
||||||
|
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
|
||||||
|
dnl depending on --{enable,disable}-{shared,static} and on the presence of
|
||||||
|
dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
|
||||||
|
dnl $(top_builddir)/intl/libintl.a will be created.
|
||||||
|
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
|
||||||
|
dnl implementations (in libc or libintl) without the ngettext() function
|
||||||
|
dnl will be ignored. If NEEDSYMBOL is specified and is
|
||||||
|
dnl 'need-formatstring-macros', then GNU gettext implementations that don't
|
||||||
|
dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
|
||||||
|
dnl INTLDIR is used to find the intl libraries. If empty,
|
||||||
|
dnl the value `$(top_builddir)/intl/' is used.
|
||||||
|
dnl
|
||||||
|
dnl The result of the configuration is one of three cases:
|
||||||
|
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
|
||||||
|
dnl and used.
|
||||||
|
dnl Catalog format: GNU --> install in $(datadir)
|
||||||
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
||||||
|
dnl 2) GNU gettext has been found in the system's C library.
|
||||||
|
dnl Catalog format: GNU --> install in $(datadir)
|
||||||
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
||||||
|
dnl 3) No internationalization, always use English msgid.
|
||||||
|
dnl Catalog format: none
|
||||||
|
dnl Catalog extension: none
|
||||||
|
dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
|
||||||
|
dnl The use of .gmo is historical (it was needed to avoid overwriting the
|
||||||
|
dnl GNU format catalogs when building on a platform with an X/Open gettext),
|
||||||
|
dnl but we keep it in order not to force irrelevant filename changes on the
|
||||||
|
dnl maintainers.
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([AM_GNU_GETTEXT],
|
||||||
|
[
|
||||||
|
dnl Argument checking.
|
||||||
|
ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
|
||||||
|
[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
|
||||||
|
])])])])])
|
||||||
|
ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
|
||||||
|
[AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
|
||||||
|
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
||||||
|
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
||||||
|
])])])])
|
||||||
|
define([gt_included_intl],
|
||||||
|
ifelse([$1], [external],
|
||||||
|
ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
|
||||||
|
[yes]))
|
||||||
|
define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
|
||||||
|
gt_NEEDS_INIT
|
||||||
|
AM_GNU_GETTEXT_NEED([$2])
|
||||||
|
|
||||||
|
AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
||||||
|
ifelse(gt_included_intl, yes, [
|
||||||
|
AC_REQUIRE([AM_INTL_SUBDIR])dnl
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||||
|
AC_REQUIRE([AC_LIB_RPATH])
|
||||||
|
|
||||||
|
dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
||||||
|
dnl Ideally we would do this search only after the
|
||||||
|
dnl if test "$USE_NLS" = "yes"; then
|
||||||
|
dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
|
||||||
|
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
|
||||||
|
dnl the configure script would need to contain the same shell code
|
||||||
|
dnl again, outside any 'if'. There are two solutions:
|
||||||
|
dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
|
||||||
|
dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
|
||||||
|
dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
|
||||||
|
dnl documented, we avoid it.
|
||||||
|
ifelse(gt_included_intl, yes, , [
|
||||||
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
|
||||||
|
gt_INTL_MACOSX
|
||||||
|
|
||||||
|
dnl Set USE_NLS.
|
||||||
|
AC_REQUIRE([AM_NLS])
|
||||||
|
|
||||||
|
ifelse(gt_included_intl, yes, [
|
||||||
|
BUILD_INCLUDED_LIBINTL=no
|
||||||
|
USE_INCLUDED_LIBINTL=no
|
||||||
|
])
|
||||||
|
LIBINTL=
|
||||||
|
LTLIBINTL=
|
||||||
|
POSUB=
|
||||||
|
|
||||||
|
dnl Add a version number to the cache macros.
|
||||||
|
case " $gt_needs " in
|
||||||
|
*" need-formatstring-macros "*) gt_api_version=3 ;;
|
||||||
|
*" need-ngettext "*) gt_api_version=2 ;;
|
||||||
|
*) gt_api_version=1 ;;
|
||||||
|
esac
|
||||||
|
gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
|
||||||
|
gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
|
||||||
|
|
||||||
|
dnl If we use NLS figure out what method
|
||||||
|
if test "$USE_NLS" = "yes"; then
|
||||||
|
gt_use_preinstalled_gnugettext=no
|
||||||
|
ifelse(gt_included_intl, yes, [
|
||||||
|
AC_MSG_CHECKING([whether included gettext is requested])
|
||||||
|
AC_ARG_WITH([included-gettext],
|
||||||
|
[ --with-included-gettext use the GNU gettext library included here],
|
||||||
|
nls_cv_force_use_gnu_gettext=$withval,
|
||||||
|
nls_cv_force_use_gnu_gettext=no)
|
||||||
|
AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
|
||||||
|
|
||||||
|
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
||||||
|
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
||||||
|
])
|
||||||
|
dnl User does not insist on using GNU NLS library. Figure out what
|
||||||
|
dnl to use. If GNU gettext is available we use this. Else we have
|
||||||
|
dnl to fall back to GNU NLS library.
|
||||||
|
|
||||||
|
if test $gt_api_version -ge 3; then
|
||||||
|
gt_revision_test_code='
|
||||||
|
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
|
||||||
|
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
|
||||||
|
#endif
|
||||||
|
changequote(,)dnl
|
||||||
|
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
|
||||||
|
changequote([,])dnl
|
||||||
|
'
|
||||||
|
else
|
||||||
|
gt_revision_test_code=
|
||||||
|
fi
|
||||||
|
if test $gt_api_version -ge 2; then
|
||||||
|
gt_expression_test_code=' + * ngettext ("", "", 0)'
|
||||||
|
else
|
||||||
|
gt_expression_test_code=
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
|
||||||
|
[AC_TRY_LINK([#include <libintl.h>
|
||||||
|
$gt_revision_test_code
|
||||||
|
extern int _nl_msg_cat_cntr;
|
||||||
|
extern int *_nl_domain_bindings;],
|
||||||
|
[bindtextdomain ("", "");
|
||||||
|
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],
|
||||||
|
[eval "$gt_func_gnugettext_libc=yes"],
|
||||||
|
[eval "$gt_func_gnugettext_libc=no"])])
|
||||||
|
|
||||||
|
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
|
||||||
|
dnl Sometimes libintl requires libiconv, so first search for libiconv.
|
||||||
|
ifelse(gt_included_intl, yes, , [
|
||||||
|
AM_ICONV_LINK
|
||||||
|
])
|
||||||
|
dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
|
||||||
|
dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
|
||||||
|
dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
|
||||||
|
dnl even if libiconv doesn't exist.
|
||||||
|
AC_LIB_LINKFLAGS_BODY([intl])
|
||||||
|
AC_CACHE_CHECK([for GNU gettext in libintl],
|
||||||
|
[$gt_func_gnugettext_libintl],
|
||||||
|
[gt_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
CPPFLAGS="$CPPFLAGS $INCINTL"
|
||||||
|
gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS $LIBINTL"
|
||||||
|
dnl Now see whether libintl exists and does not depend on libiconv.
|
||||||
|
AC_TRY_LINK([#include <libintl.h>
|
||||||
|
$gt_revision_test_code
|
||||||
|
extern int _nl_msg_cat_cntr;
|
||||||
|
extern
|
||||||
|
#ifdef __cplusplus
|
||||||
|
"C"
|
||||||
|
#endif
|
||||||
|
const char *_nl_expand_alias (const char *);],
|
||||||
|
[bindtextdomain ("", "");
|
||||||
|
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
||||||
|
[eval "$gt_func_gnugettext_libintl=yes"],
|
||||||
|
[eval "$gt_func_gnugettext_libintl=no"])
|
||||||
|
dnl Now see whether libintl exists and depends on libiconv.
|
||||||
|
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
|
||||||
|
LIBS="$LIBS $LIBICONV"
|
||||||
|
AC_TRY_LINK([#include <libintl.h>
|
||||||
|
$gt_revision_test_code
|
||||||
|
extern int _nl_msg_cat_cntr;
|
||||||
|
extern
|
||||||
|
#ifdef __cplusplus
|
||||||
|
"C"
|
||||||
|
#endif
|
||||||
|
const char *_nl_expand_alias (const char *);],
|
||||||
|
[bindtextdomain ("", "");
|
||||||
|
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
||||||
|
[LIBINTL="$LIBINTL $LIBICONV"
|
||||||
|
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
||||||
|
eval "$gt_func_gnugettext_libintl=yes"
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
CPPFLAGS="$gt_save_CPPFLAGS"
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl If an already present or preinstalled GNU gettext() is found,
|
||||||
|
dnl use it. But if this macro is used in GNU gettext, and GNU
|
||||||
|
dnl gettext is already preinstalled in libintl, we update this
|
||||||
|
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
||||||
|
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|
||||||
|
|| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
|
||||||
|
&& test "$PACKAGE" != gettext-runtime \
|
||||||
|
&& test "$PACKAGE" != gettext-tools; }; then
|
||||||
|
gt_use_preinstalled_gnugettext=yes
|
||||||
|
else
|
||||||
|
dnl Reset the values set by searching for libintl.
|
||||||
|
LIBINTL=
|
||||||
|
LTLIBINTL=
|
||||||
|
INCINTL=
|
||||||
|
fi
|
||||||
|
|
||||||
|
ifelse(gt_included_intl, yes, [
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" != "yes"; then
|
||||||
|
dnl GNU gettext is not found in the C library.
|
||||||
|
dnl Fall back on included GNU gettext library.
|
||||||
|
nls_cv_use_gnu_gettext=yes
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
|
dnl Mark actions used to generate GNU NLS library.
|
||||||
|
BUILD_INCLUDED_LIBINTL=yes
|
||||||
|
USE_INCLUDED_LIBINTL=yes
|
||||||
|
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
|
||||||
|
LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
|
||||||
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
||||||
|
fi
|
||||||
|
|
||||||
|
CATOBJEXT=
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
|
dnl Mark actions to use GNU gettext tools.
|
||||||
|
CATOBJEXT=.gmo
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
if test -n "$INTL_MACOSX_LIBS"; then
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
|
dnl Some extra flags are needed during linking.
|
||||||
|
LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
|
||||||
|
LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
||||||
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
||||||
|
AC_DEFINE([ENABLE_NLS], [1],
|
||||||
|
[Define to 1 if translation of program messages to the user's native language
|
||||||
|
is requested.])
|
||||||
|
else
|
||||||
|
USE_NLS=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether to use NLS])
|
||||||
|
AC_MSG_RESULT([$USE_NLS])
|
||||||
|
if test "$USE_NLS" = "yes"; then
|
||||||
|
AC_MSG_CHECKING([where the gettext function comes from])
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
||||||
|
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
|
||||||
|
gt_source="external libintl"
|
||||||
|
else
|
||||||
|
gt_source="libc"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
gt_source="included intl directory"
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT([$gt_source])
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$USE_NLS" = "yes"; then
|
||||||
|
|
||||||
|
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
||||||
|
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
|
||||||
|
AC_MSG_CHECKING([how to link with libintl])
|
||||||
|
AC_MSG_RESULT([$LIBINTL])
|
||||||
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some packages may be using this.
|
||||||
|
AC_DEFINE([HAVE_GETTEXT], [1],
|
||||||
|
[Define if the GNU gettext() function is already present or preinstalled.])
|
||||||
|
AC_DEFINE([HAVE_DCGETTEXT], [1],
|
||||||
|
[Define if the GNU dcgettext() function is already present or preinstalled.])
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl We need to process the po/ directory.
|
||||||
|
POSUB=po
|
||||||
|
fi
|
||||||
|
|
||||||
|
ifelse(gt_included_intl, yes, [
|
||||||
|
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
||||||
|
dnl to 'yes' because some of the testsuite requires it.
|
||||||
|
if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
|
||||||
|
BUILD_INCLUDED_LIBINTL=yes
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl Make all variables we use known to autoconf.
|
||||||
|
AC_SUBST([BUILD_INCLUDED_LIBINTL])
|
||||||
|
AC_SUBST([USE_INCLUDED_LIBINTL])
|
||||||
|
AC_SUBST([CATOBJEXT])
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some configure.ins may be using this.
|
||||||
|
nls_cv_header_intl=
|
||||||
|
nls_cv_header_libgt=
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
DATADIRNAME=share
|
||||||
|
AC_SUBST([DATADIRNAME])
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
INSTOBJEXT=.mo
|
||||||
|
AC_SUBST([INSTOBJEXT])
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
GENCAT=gencat
|
||||||
|
AC_SUBST([GENCAT])
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
INTLOBJS=
|
||||||
|
if test "$USE_INCLUDED_LIBINTL" = yes; then
|
||||||
|
INTLOBJS="\$(GETTOBJS)"
|
||||||
|
fi
|
||||||
|
AC_SUBST([INTLOBJS])
|
||||||
|
|
||||||
|
dnl Enable libtool support if the surrounding package wishes it.
|
||||||
|
INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
|
||||||
|
AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
INTLLIBS="$LIBINTL"
|
||||||
|
AC_SUBST([INTLLIBS])
|
||||||
|
|
||||||
|
dnl Make all documented variables known to autoconf.
|
||||||
|
AC_SUBST([LIBINTL])
|
||||||
|
AC_SUBST([LTLIBINTL])
|
||||||
|
AC_SUBST([POSUB])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
|
||||||
|
m4_define([gt_NEEDS_INIT],
|
||||||
|
[
|
||||||
|
m4_divert_text([DEFAULTS], [gt_needs=])
|
||||||
|
m4_define([gt_NEEDS_INIT], [])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
|
||||||
|
AC_DEFUN([AM_GNU_GETTEXT_NEED],
|
||||||
|
[
|
||||||
|
m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
|
||||||
|
AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
|
||||||
180
dist/xkeyboard-config/m4/iconv.m4
vendored
Normal file
180
dist/xkeyboard-config/m4/iconv.m4
vendored
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
# iconv.m4 serial AM6 (gettext-0.17)
|
||||||
|
dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
||||||
|
[
|
||||||
|
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||||
|
AC_REQUIRE([AC_LIB_RPATH])
|
||||||
|
|
||||||
|
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||||||
|
dnl accordingly.
|
||||||
|
AC_LIB_LINKFLAGS_BODY([iconv])
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([AM_ICONV_LINK],
|
||||||
|
[
|
||||||
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
||||||
|
dnl those with the standalone portable GNU libiconv installed).
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
||||||
|
|
||||||
|
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||||||
|
dnl accordingly.
|
||||||
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
||||||
|
|
||||||
|
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
||||||
|
dnl because if the user has installed libiconv and not disabled its use
|
||||||
|
dnl via --without-libiconv-prefix, he wants to use it. The first
|
||||||
|
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
||||||
|
am_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [
|
||||||
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
||||||
|
am_cv_lib_iconv=no
|
||||||
|
AC_TRY_LINK([#include <stdlib.h>
|
||||||
|
#include <iconv.h>],
|
||||||
|
[iconv_t cd = iconv_open("","");
|
||||||
|
iconv(cd,NULL,NULL,NULL,NULL);
|
||||||
|
iconv_close(cd);],
|
||||||
|
am_cv_func_iconv=yes)
|
||||||
|
if test "$am_cv_func_iconv" != yes; then
|
||||||
|
am_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS $LIBICONV"
|
||||||
|
AC_TRY_LINK([#include <stdlib.h>
|
||||||
|
#include <iconv.h>],
|
||||||
|
[iconv_t cd = iconv_open("","");
|
||||||
|
iconv(cd,NULL,NULL,NULL,NULL);
|
||||||
|
iconv_close(cd);],
|
||||||
|
am_cv_lib_iconv=yes
|
||||||
|
am_cv_func_iconv=yes)
|
||||||
|
LIBS="$am_save_LIBS"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
if test "$am_cv_func_iconv" = yes; then
|
||||||
|
AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [
|
||||||
|
dnl This tests against bugs in AIX 5.1 and HP-UX 11.11.
|
||||||
|
am_save_LIBS="$LIBS"
|
||||||
|
if test $am_cv_lib_iconv = yes; then
|
||||||
|
LIBS="$LIBS $LIBICONV"
|
||||||
|
fi
|
||||||
|
AC_TRY_RUN([
|
||||||
|
#include <iconv.h>
|
||||||
|
#include <string.h>
|
||||||
|
int main ()
|
||||||
|
{
|
||||||
|
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
||||||
|
returns. */
|
||||||
|
{
|
||||||
|
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
||||||
|
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
||||||
|
{
|
||||||
|
static const char input[] = "\342\202\254"; /* EURO SIGN */
|
||||||
|
char buf[10];
|
||||||
|
const char *inptr = input;
|
||||||
|
size_t inbytesleft = strlen (input);
|
||||||
|
char *outptr = buf;
|
||||||
|
size_t outbytesleft = sizeof (buf);
|
||||||
|
size_t res = iconv (cd_utf8_to_88591,
|
||||||
|
(char **) &inptr, &inbytesleft,
|
||||||
|
&outptr, &outbytesleft);
|
||||||
|
if (res == 0)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#if 0 /* This bug could be worked around by the caller. */
|
||||||
|
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
|
||||||
|
{
|
||||||
|
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
||||||
|
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
||||||
|
{
|
||||||
|
static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
||||||
|
char buf[50];
|
||||||
|
const char *inptr = input;
|
||||||
|
size_t inbytesleft = strlen (input);
|
||||||
|
char *outptr = buf;
|
||||||
|
size_t outbytesleft = sizeof (buf);
|
||||||
|
size_t res = iconv (cd_88591_to_utf8,
|
||||||
|
(char **) &inptr, &inbytesleft,
|
||||||
|
&outptr, &outbytesleft);
|
||||||
|
if ((int)res > 0)
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
||||||
|
provided. */
|
||||||
|
if (/* Try standardized names. */
|
||||||
|
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
|
||||||
|
/* Try IRIX, OSF/1 names. */
|
||||||
|
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
|
||||||
|
/* Try AIX names. */
|
||||||
|
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
||||||
|
/* Try HP-UX names. */
|
||||||
|
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
||||||
|
return 1;
|
||||||
|
return 0;
|
||||||
|
}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
|
||||||
|
[case "$host_os" in
|
||||||
|
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
||||||
|
*) am_cv_func_iconv_works="guessing yes" ;;
|
||||||
|
esac])
|
||||||
|
LIBS="$am_save_LIBS"
|
||||||
|
])
|
||||||
|
case "$am_cv_func_iconv_works" in
|
||||||
|
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
|
||||||
|
*) am_func_iconv=yes ;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
am_func_iconv=no am_cv_lib_iconv=no
|
||||||
|
fi
|
||||||
|
if test "$am_func_iconv" = yes; then
|
||||||
|
AC_DEFINE(HAVE_ICONV, 1,
|
||||||
|
[Define if you have the iconv() function and it works.])
|
||||||
|
fi
|
||||||
|
if test "$am_cv_lib_iconv" = yes; then
|
||||||
|
AC_MSG_CHECKING([how to link with libiconv])
|
||||||
|
AC_MSG_RESULT([$LIBICONV])
|
||||||
|
else
|
||||||
|
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
||||||
|
dnl either.
|
||||||
|
CPPFLAGS="$am_save_CPPFLAGS"
|
||||||
|
LIBICONV=
|
||||||
|
LTLIBICONV=
|
||||||
|
fi
|
||||||
|
AC_SUBST(LIBICONV)
|
||||||
|
AC_SUBST(LTLIBICONV)
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([AM_ICONV],
|
||||||
|
[
|
||||||
|
AM_ICONV_LINK
|
||||||
|
if test "$am_cv_func_iconv" = yes; then
|
||||||
|
AC_MSG_CHECKING([for iconv declaration])
|
||||||
|
AC_CACHE_VAL(am_cv_proto_iconv, [
|
||||||
|
AC_TRY_COMPILE([
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <iconv.h>
|
||||||
|
extern
|
||||||
|
#ifdef __cplusplus
|
||||||
|
"C"
|
||||||
|
#endif
|
||||||
|
#if defined(__STDC__) || defined(__cplusplus)
|
||||||
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
||||||
|
#else
|
||||||
|
size_t iconv();
|
||||||
|
#endif
|
||||||
|
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
||||||
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
||||||
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
||||||
|
AC_MSG_RESULT([$]{ac_t:-
|
||||||
|
}[$]am_cv_proto_iconv)
|
||||||
|
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
||||||
|
[Define as const if the declaration of iconv() needs const.])
|
||||||
|
fi
|
||||||
|
])
|
||||||
51
dist/xkeyboard-config/m4/intlmacosx.m4
vendored
Normal file
51
dist/xkeyboard-config/m4/intlmacosx.m4
vendored
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
# intlmacosx.m4 serial 3 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
dnl This file can can be used in projects which are not available under
|
||||||
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
|
dnl License but which still want to provide support for the GNU gettext
|
||||||
|
dnl functionality.
|
||||||
|
dnl Please note that the actual code of the GNU gettext library is covered
|
||||||
|
dnl by the GNU Library General Public License, and the rest of the GNU
|
||||||
|
dnl gettext package package is covered by the GNU General Public License.
|
||||||
|
dnl They are *not* in the public domain.
|
||||||
|
|
||||||
|
dnl Checks for special options needed on MacOS X.
|
||||||
|
dnl Defines INTL_MACOSX_LIBS.
|
||||||
|
AC_DEFUN([gt_INTL_MACOSX],
|
||||||
|
[
|
||||||
|
dnl Check for API introduced in MacOS X 10.2.
|
||||||
|
AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
|
||||||
|
[gt_cv_func_CFPreferencesCopyAppValue],
|
||||||
|
[gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
|
||||||
|
AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
|
||||||
|
[CFPreferencesCopyAppValue(NULL, NULL)],
|
||||||
|
[gt_cv_func_CFPreferencesCopyAppValue=yes],
|
||||||
|
[gt_cv_func_CFPreferencesCopyAppValue=no])
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
|
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
|
||||||
|
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
|
||||||
|
[Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
|
||||||
|
fi
|
||||||
|
dnl Check for API introduced in MacOS X 10.3.
|
||||||
|
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
|
||||||
|
[gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
|
||||||
|
AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
|
||||||
|
[gt_cv_func_CFLocaleCopyCurrent=yes],
|
||||||
|
[gt_cv_func_CFLocaleCopyCurrent=no])
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
|
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
||||||
|
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
|
||||||
|
[Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
|
||||||
|
fi
|
||||||
|
INTL_MACOSX_LIBS=
|
||||||
|
if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
|
||||||
|
INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
|
||||||
|
fi
|
||||||
|
AC_SUBST([INTL_MACOSX_LIBS])
|
||||||
|
])
|
||||||
110
dist/xkeyboard-config/m4/lib-ld.m4
vendored
Normal file
110
dist/xkeyboard-config/m4/lib-ld.m4
vendored
Normal file
@ -0,0 +1,110 @@
|
|||||||
|
# lib-ld.m4 serial 4 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl Subroutines of libtool.m4,
|
||||||
|
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
||||||
|
dnl with libtool.m4.
|
||||||
|
|
||||||
|
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
||||||
|
AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
||||||
|
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
|
||||||
|
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||||
|
case `$LD -v 2>&1 </dev/null` in
|
||||||
|
*GNU* | *'with BFD'*)
|
||||||
|
acl_cv_prog_gnu_ld=yes ;;
|
||||||
|
*)
|
||||||
|
acl_cv_prog_gnu_ld=no ;;
|
||||||
|
esac])
|
||||||
|
with_gnu_ld=$acl_cv_prog_gnu_ld
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl From libtool-1.4. Sets the variable LD.
|
||||||
|
AC_DEFUN([AC_LIB_PROG_LD],
|
||||||
|
[AC_ARG_WITH([gnu-ld],
|
||||||
|
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
||||||
|
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
||||||
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
|
# Prepare PATH_SEPARATOR.
|
||||||
|
# The user is always right.
|
||||||
|
if test "${PATH_SEPARATOR+set}" != set; then
|
||||||
|
echo "#! /bin/sh" >conf$$.sh
|
||||||
|
echo "exit 0" >>conf$$.sh
|
||||||
|
chmod +x conf$$.sh
|
||||||
|
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||||||
|
PATH_SEPARATOR=';'
|
||||||
|
else
|
||||||
|
PATH_SEPARATOR=:
|
||||||
|
fi
|
||||||
|
rm -f conf$$.sh
|
||||||
|
fi
|
||||||
|
ac_prog=ld
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
# Check if gcc -print-prog-name=ld gives a path.
|
||||||
|
AC_MSG_CHECKING([for ld used by GCC])
|
||||||
|
case $host in
|
||||||
|
*-*-mingw*)
|
||||||
|
# gcc leaves a trailing carriage return which upsets mingw
|
||||||
|
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
||||||
|
*)
|
||||||
|
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
||||||
|
esac
|
||||||
|
case $ac_prog in
|
||||||
|
# Accept absolute paths.
|
||||||
|
[[\\/]* | [A-Za-z]:[\\/]*)]
|
||||||
|
[re_direlt='/[^/][^/]*/\.\./']
|
||||||
|
# Canonicalize the path of ld
|
||||||
|
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
||||||
|
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||||
|
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||||
|
done
|
||||||
|
test -z "$LD" && LD="$ac_prog"
|
||||||
|
;;
|
||||||
|
"")
|
||||||
|
# If it fails, then pretend we aren't using GCC.
|
||||||
|
ac_prog=ld
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
# If it is relative, then search for the first ld in PATH.
|
||||||
|
with_gnu_ld=unknown
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
elif test "$with_gnu_ld" = yes; then
|
||||||
|
AC_MSG_CHECKING([for GNU ld])
|
||||||
|
else
|
||||||
|
AC_MSG_CHECKING([for non-GNU ld])
|
||||||
|
fi
|
||||||
|
AC_CACHE_VAL([acl_cv_path_LD],
|
||||||
|
[if test -z "$LD"; then
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
||||||
|
for ac_dir in $PATH; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
||||||
|
acl_cv_path_LD="$ac_dir/$ac_prog"
|
||||||
|
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||||
|
# but apparently some GNU ld's only accept -v.
|
||||||
|
# Break only if it was the GNU/non-GNU ld that we prefer.
|
||||||
|
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
|
||||||
|
*GNU* | *'with BFD'*)
|
||||||
|
test "$with_gnu_ld" != no && break ;;
|
||||||
|
*)
|
||||||
|
test "$with_gnu_ld" != yes && break ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
else
|
||||||
|
acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||||
|
fi])
|
||||||
|
LD="$acl_cv_path_LD"
|
||||||
|
if test -n "$LD"; then
|
||||||
|
AC_MSG_RESULT([$LD])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
fi
|
||||||
|
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||||
|
AC_LIB_PROG_LD_GNU
|
||||||
|
])
|
||||||
774
dist/xkeyboard-config/m4/lib-link.m4
vendored
Normal file
774
dist/xkeyboard-config/m4/lib-link.m4
vendored
Normal file
@ -0,0 +1,774 @@
|
|||||||
|
# lib-link.m4 serial 21 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
AC_PREREQ([2.54])
|
||||||
|
|
||||||
|
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
||||||
|
dnl the libraries corresponding to explicit and implicit dependencies.
|
||||||
|
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
||||||
|
dnl augments the CPPFLAGS variable.
|
||||||
|
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
||||||
|
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||||
|
AC_DEFUN([AC_LIB_LINKFLAGS],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||||
|
AC_REQUIRE([AC_LIB_RPATH])
|
||||||
|
pushdef([Name],[translit([$1],[./-], [___])])
|
||||||
|
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
||||||
|
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
||||||
|
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
||||||
|
ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
||||||
|
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
||||||
|
ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
|
||||||
|
])
|
||||||
|
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
||||||
|
LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
||||||
|
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
||||||
|
LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
|
||||||
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
||||||
|
AC_SUBST([LIB]NAME)
|
||||||
|
AC_SUBST([LTLIB]NAME)
|
||||||
|
AC_SUBST([LIB]NAME[_PREFIX])
|
||||||
|
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
||||||
|
dnl results of this search when this library appears as a dependency.
|
||||||
|
HAVE_LIB[]NAME=yes
|
||||||
|
popdef([NAME])
|
||||||
|
popdef([Name])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
|
||||||
|
dnl searches for libname and the libraries corresponding to explicit and
|
||||||
|
dnl implicit dependencies, together with the specified include files and
|
||||||
|
dnl the ability to compile and link the specified testcode. The missing-message
|
||||||
|
dnl defaults to 'no' and may contain additional hints for the user.
|
||||||
|
dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
|
||||||
|
dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
||||||
|
dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
||||||
|
dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
||||||
|
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
||||||
|
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||||
|
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||||
|
AC_REQUIRE([AC_LIB_RPATH])
|
||||||
|
pushdef([Name],[translit([$1],[./-], [___])])
|
||||||
|
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
|
||||||
|
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
||||||
|
dnl accordingly.
|
||||||
|
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
||||||
|
|
||||||
|
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
||||||
|
dnl because if the user has installed lib[]Name and not disabled its use
|
||||||
|
dnl via --without-lib[]Name-prefix, he wants to use it.
|
||||||
|
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||||
|
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
||||||
|
|
||||||
|
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
||||||
|
ac_save_LIBS="$LIBS"
|
||||||
|
dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
|
||||||
|
dnl because these -l options might require -L options that are present in
|
||||||
|
dnl LIBS. -l options benefit only from the -L options listed before it.
|
||||||
|
dnl Otherwise, add it to the front of LIBS, because it may be a static
|
||||||
|
dnl library that depends on another static library that is present in LIBS.
|
||||||
|
dnl Static libraries benefit only from the static libraries listed after
|
||||||
|
dnl it.
|
||||||
|
case " $LIB[]NAME" in
|
||||||
|
*" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
|
||||||
|
*) LIBS="$LIB[]NAME $LIBS" ;;
|
||||||
|
esac
|
||||||
|
AC_TRY_LINK([$3], [$4],
|
||||||
|
[ac_cv_lib[]Name=yes],
|
||||||
|
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
|
||||||
|
LIBS="$ac_save_LIBS"
|
||||||
|
])
|
||||||
|
if test "$ac_cv_lib[]Name" = yes; then
|
||||||
|
HAVE_LIB[]NAME=yes
|
||||||
|
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
|
||||||
|
AC_MSG_CHECKING([how to link with lib[]$1])
|
||||||
|
AC_MSG_RESULT([$LIB[]NAME])
|
||||||
|
else
|
||||||
|
HAVE_LIB[]NAME=no
|
||||||
|
dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
||||||
|
dnl $INC[]NAME either.
|
||||||
|
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||||
|
LIB[]NAME=
|
||||||
|
LTLIB[]NAME=
|
||||||
|
LIB[]NAME[]_PREFIX=
|
||||||
|
fi
|
||||||
|
AC_SUBST([HAVE_LIB]NAME)
|
||||||
|
AC_SUBST([LIB]NAME)
|
||||||
|
AC_SUBST([LTLIB]NAME)
|
||||||
|
AC_SUBST([LIB]NAME[_PREFIX])
|
||||||
|
popdef([NAME])
|
||||||
|
popdef([Name])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Determine the platform dependent parameters needed to use rpath:
|
||||||
|
dnl acl_libext,
|
||||||
|
dnl acl_shlibext,
|
||||||
|
dnl acl_hardcode_libdir_flag_spec,
|
||||||
|
dnl acl_hardcode_libdir_separator,
|
||||||
|
dnl acl_hardcode_direct,
|
||||||
|
dnl acl_hardcode_minus_L.
|
||||||
|
AC_DEFUN([AC_LIB_RPATH],
|
||||||
|
[
|
||||||
|
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
||||||
|
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
||||||
|
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
||||||
|
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||||
|
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
||||||
|
AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
|
||||||
|
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
||||||
|
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
||||||
|
. ./conftest.sh
|
||||||
|
rm -f ./conftest.sh
|
||||||
|
acl_cv_rpath=done
|
||||||
|
])
|
||||||
|
wl="$acl_cv_wl"
|
||||||
|
acl_libext="$acl_cv_libext"
|
||||||
|
acl_shlibext="$acl_cv_shlibext"
|
||||||
|
acl_libname_spec="$acl_cv_libname_spec"
|
||||||
|
acl_library_names_spec="$acl_cv_library_names_spec"
|
||||||
|
acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
||||||
|
acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
||||||
|
acl_hardcode_direct="$acl_cv_hardcode_direct"
|
||||||
|
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
||||||
|
dnl Determine whether the user wants rpath handling at all.
|
||||||
|
AC_ARG_ENABLE([rpath],
|
||||||
|
[ --disable-rpath do not hardcode runtime library paths],
|
||||||
|
:, enable_rpath=yes)
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_FROMPACKAGE(name, package)
|
||||||
|
dnl declares that libname comes from the given package. The configure file
|
||||||
|
dnl will then not have a --with-libname-prefix option but a
|
||||||
|
dnl --with-package-prefix option. Several libraries can come from the same
|
||||||
|
dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
|
||||||
|
dnl macro call that searches for libname.
|
||||||
|
AC_DEFUN([AC_LIB_FROMPACKAGE],
|
||||||
|
[
|
||||||
|
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
define([acl_frompackage_]NAME, [$2])
|
||||||
|
popdef([NAME])
|
||||||
|
pushdef([PACK],[$2])
|
||||||
|
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
define([acl_libsinpackage_]PACKUP,
|
||||||
|
m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
|
||||||
|
popdef([PACKUP])
|
||||||
|
popdef([PACK])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
||||||
|
dnl the libraries corresponding to explicit and implicit dependencies.
|
||||||
|
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
||||||
|
dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
|
||||||
|
dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||||
|
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||||
|
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
|
||||||
|
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
||||||
|
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||||
|
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
|
||||||
|
dnl Autoconf >= 2.61 supports dots in --with options.
|
||||||
|
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
|
||||||
|
dnl By default, look in $includedir and $libdir.
|
||||||
|
use_additional=yes
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([
|
||||||
|
eval additional_includedir=\"$includedir\"
|
||||||
|
eval additional_libdir=\"$libdir\"
|
||||||
|
])
|
||||||
|
AC_ARG_WITH(P_A_C_K[-prefix],
|
||||||
|
[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
|
||||||
|
--without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
|
||||||
|
[
|
||||||
|
if test "X$withval" = "Xno"; then
|
||||||
|
use_additional=no
|
||||||
|
else
|
||||||
|
if test "X$withval" = "X"; then
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([
|
||||||
|
eval additional_includedir=\"$includedir\"
|
||||||
|
eval additional_libdir=\"$libdir\"
|
||||||
|
])
|
||||||
|
else
|
||||||
|
additional_includedir="$withval/include"
|
||||||
|
additional_libdir="$withval/$acl_libdirstem"
|
||||||
|
if test "$acl_libdirstem2" != "$acl_libdirstem" \
|
||||||
|
&& ! test -d "$withval/$acl_libdirstem"; then
|
||||||
|
additional_libdir="$withval/$acl_libdirstem2"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
dnl Search the library and its dependencies in $additional_libdir and
|
||||||
|
dnl $LDFLAGS. Using breadth-first-seach.
|
||||||
|
LIB[]NAME=
|
||||||
|
LTLIB[]NAME=
|
||||||
|
INC[]NAME=
|
||||||
|
LIB[]NAME[]_PREFIX=
|
||||||
|
dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
|
||||||
|
dnl computed. So it has to be reset here.
|
||||||
|
HAVE_LIB[]NAME=
|
||||||
|
rpathdirs=
|
||||||
|
ltrpathdirs=
|
||||||
|
names_already_handled=
|
||||||
|
names_next_round='$1 $2'
|
||||||
|
while test -n "$names_next_round"; do
|
||||||
|
names_this_round="$names_next_round"
|
||||||
|
names_next_round=
|
||||||
|
for name in $names_this_round; do
|
||||||
|
already_handled=
|
||||||
|
for n in $names_already_handled; do
|
||||||
|
if test "$n" = "$name"; then
|
||||||
|
already_handled=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$already_handled"; then
|
||||||
|
names_already_handled="$names_already_handled $name"
|
||||||
|
dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
||||||
|
dnl or AC_LIB_HAVE_LINKFLAGS call.
|
||||||
|
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
||||||
|
eval value=\"\$HAVE_LIB$uppername\"
|
||||||
|
if test -n "$value"; then
|
||||||
|
if test "$value" = yes; then
|
||||||
|
eval value=\"\$LIB$uppername\"
|
||||||
|
test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
||||||
|
eval value=\"\$LTLIB$uppername\"
|
||||||
|
test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
||||||
|
else
|
||||||
|
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
||||||
|
dnl that this library doesn't exist. So just drop it.
|
||||||
|
:
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
||||||
|
dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
||||||
|
found_dir=
|
||||||
|
found_la=
|
||||||
|
found_so=
|
||||||
|
found_a=
|
||||||
|
eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
|
||||||
|
if test -n "$acl_shlibext"; then
|
||||||
|
shrext=".$acl_shlibext" # typically: shrext=.so
|
||||||
|
else
|
||||||
|
shrext=
|
||||||
|
fi
|
||||||
|
if test $use_additional = yes; then
|
||||||
|
dir="$additional_libdir"
|
||||||
|
dnl The same code as in the loop below:
|
||||||
|
dnl First look for a shared library.
|
||||||
|
if test -n "$acl_shlibext"; then
|
||||||
|
if test -f "$dir/$libname$shrext"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$libname$shrext"
|
||||||
|
else
|
||||||
|
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
||||||
|
ver=`(cd "$dir" && \
|
||||||
|
for f in "$libname$shrext".*; do echo "$f"; done \
|
||||||
|
| sed -e "s,^$libname$shrext\\\\.,," \
|
||||||
|
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
||||||
|
| sed 1q ) 2>/dev/null`
|
||||||
|
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$libname$shrext.$ver"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
eval library_names=\"$acl_library_names_spec\"
|
||||||
|
for f in $library_names; do
|
||||||
|
if test -f "$dir/$f"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$f"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
dnl Then look for a static library.
|
||||||
|
if test "X$found_dir" = "X"; then
|
||||||
|
if test -f "$dir/$libname.$acl_libext"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_a="$dir/$libname.$acl_libext"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$found_dir" != "X"; then
|
||||||
|
if test -f "$dir/$libname.la"; then
|
||||||
|
found_la="$dir/$libname.la"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$found_dir" = "X"; then
|
||||||
|
for x in $LDFLAGS $LTLIB[]NAME; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
case "$x" in
|
||||||
|
-L*)
|
||||||
|
dir=`echo "X$x" | sed -e 's/^X-L//'`
|
||||||
|
dnl First look for a shared library.
|
||||||
|
if test -n "$acl_shlibext"; then
|
||||||
|
if test -f "$dir/$libname$shrext"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$libname$shrext"
|
||||||
|
else
|
||||||
|
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
||||||
|
ver=`(cd "$dir" && \
|
||||||
|
for f in "$libname$shrext".*; do echo "$f"; done \
|
||||||
|
| sed -e "s,^$libname$shrext\\\\.,," \
|
||||||
|
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
||||||
|
| sed 1q ) 2>/dev/null`
|
||||||
|
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$libname$shrext.$ver"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
eval library_names=\"$acl_library_names_spec\"
|
||||||
|
for f in $library_names; do
|
||||||
|
if test -f "$dir/$f"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_so="$dir/$f"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
dnl Then look for a static library.
|
||||||
|
if test "X$found_dir" = "X"; then
|
||||||
|
if test -f "$dir/$libname.$acl_libext"; then
|
||||||
|
found_dir="$dir"
|
||||||
|
found_a="$dir/$libname.$acl_libext"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$found_dir" != "X"; then
|
||||||
|
if test -f "$dir/$libname.la"; then
|
||||||
|
found_la="$dir/$libname.la"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "X$found_dir" != "X"; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if test "X$found_dir" != "X"; then
|
||||||
|
dnl Found the library.
|
||||||
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
||||||
|
if test "X$found_so" != "X"; then
|
||||||
|
dnl Linking with a shared library. We attempt to hardcode its
|
||||||
|
dnl directory into the executable's runpath, unless it's the
|
||||||
|
dnl standard /usr/lib.
|
||||||
|
if test "$enable_rpath" = no \
|
||||||
|
|| test "X$found_dir" = "X/usr/$acl_libdirstem" \
|
||||||
|
|| test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
|
||||||
|
dnl No hardcoding is needed.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||||
|
else
|
||||||
|
dnl Use an explicit option to hardcode DIR into the resulting
|
||||||
|
dnl binary.
|
||||||
|
dnl Potentially add DIR to ltrpathdirs.
|
||||||
|
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
||||||
|
haveit=
|
||||||
|
for x in $ltrpathdirs; do
|
||||||
|
if test "X$x" = "X$found_dir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
ltrpathdirs="$ltrpathdirs $found_dir"
|
||||||
|
fi
|
||||||
|
dnl The hardcoding into $LIBNAME is system dependent.
|
||||||
|
if test "$acl_hardcode_direct" = yes; then
|
||||||
|
dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
||||||
|
dnl resulting binary.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||||
|
else
|
||||||
|
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
||||||
|
dnl Use an explicit option to hardcode DIR into the resulting
|
||||||
|
dnl binary.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||||
|
dnl Potentially add DIR to rpathdirs.
|
||||||
|
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
||||||
|
haveit=
|
||||||
|
for x in $rpathdirs; do
|
||||||
|
if test "X$x" = "X$found_dir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
rpathdirs="$rpathdirs $found_dir"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
dnl Rely on "-L$found_dir".
|
||||||
|
dnl But don't add it if it's already contained in the LDFLAGS
|
||||||
|
dnl or the already constructed $LIBNAME
|
||||||
|
haveit=
|
||||||
|
for x in $LDFLAGS $LIB[]NAME; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-L$found_dir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
||||||
|
fi
|
||||||
|
if test "$acl_hardcode_minus_L" != no; then
|
||||||
|
dnl FIXME: Not sure whether we should use
|
||||||
|
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
||||||
|
dnl here.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||||
|
else
|
||||||
|
dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
|
||||||
|
dnl here, because this doesn't fit in flags passed to the
|
||||||
|
dnl compiler. So give up. No hardcoding. This affects only
|
||||||
|
dnl very old systems.
|
||||||
|
dnl FIXME: Not sure whether we should use
|
||||||
|
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
||||||
|
dnl here.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if test "X$found_a" != "X"; then
|
||||||
|
dnl Linking with a static library.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
||||||
|
else
|
||||||
|
dnl We shouldn't come here, but anyway it's good to have a
|
||||||
|
dnl fallback.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
dnl Assume the include files are nearby.
|
||||||
|
additional_includedir=
|
||||||
|
case "$found_dir" in
|
||||||
|
*/$acl_libdirstem | */$acl_libdirstem/)
|
||||||
|
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
||||||
|
if test "$name" = '$1'; then
|
||||||
|
LIB[]NAME[]_PREFIX="$basedir"
|
||||||
|
fi
|
||||||
|
additional_includedir="$basedir/include"
|
||||||
|
;;
|
||||||
|
*/$acl_libdirstem2 | */$acl_libdirstem2/)
|
||||||
|
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
|
||||||
|
if test "$name" = '$1'; then
|
||||||
|
LIB[]NAME[]_PREFIX="$basedir"
|
||||||
|
fi
|
||||||
|
additional_includedir="$basedir/include"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "X$additional_includedir" != "X"; then
|
||||||
|
dnl Potentially add $additional_includedir to $INCNAME.
|
||||||
|
dnl But don't add it
|
||||||
|
dnl 1. if it's the standard /usr/include,
|
||||||
|
dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
||||||
|
dnl 3. if it's already present in $CPPFLAGS or the already
|
||||||
|
dnl constructed $INCNAME,
|
||||||
|
dnl 4. if it doesn't exist as a directory.
|
||||||
|
if test "X$additional_includedir" != "X/usr/include"; then
|
||||||
|
haveit=
|
||||||
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
case $host_os in
|
||||||
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
for x in $CPPFLAGS $INC[]NAME; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-I$additional_includedir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test -d "$additional_includedir"; then
|
||||||
|
dnl Really add $additional_includedir to $INCNAME.
|
||||||
|
INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
dnl Look for dependencies.
|
||||||
|
if test -n "$found_la"; then
|
||||||
|
dnl Read the .la file. It defines the variables
|
||||||
|
dnl dlname, library_names, old_library, dependency_libs, current,
|
||||||
|
dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
||||||
|
save_libdir="$libdir"
|
||||||
|
case "$found_la" in
|
||||||
|
*/* | *\\*) . "$found_la" ;;
|
||||||
|
*) . "./$found_la" ;;
|
||||||
|
esac
|
||||||
|
libdir="$save_libdir"
|
||||||
|
dnl We use only dependency_libs.
|
||||||
|
for dep in $dependency_libs; do
|
||||||
|
case "$dep" in
|
||||||
|
-L*)
|
||||||
|
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
||||||
|
dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
||||||
|
dnl But don't add it
|
||||||
|
dnl 1. if it's the standard /usr/lib,
|
||||||
|
dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
||||||
|
dnl 3. if it's already present in $LDFLAGS or the already
|
||||||
|
dnl constructed $LIBNAME,
|
||||||
|
dnl 4. if it doesn't exist as a directory.
|
||||||
|
if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
|
||||||
|
&& test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
|
||||||
|
haveit=
|
||||||
|
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
|
||||||
|
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
case $host_os in
|
||||||
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
haveit=
|
||||||
|
for x in $LDFLAGS $LIB[]NAME; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-L$additional_libdir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test -d "$additional_libdir"; then
|
||||||
|
dnl Really add $additional_libdir to $LIBNAME.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
haveit=
|
||||||
|
for x in $LDFLAGS $LTLIB[]NAME; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-L$additional_libdir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test -d "$additional_libdir"; then
|
||||||
|
dnl Really add $additional_libdir to $LTLIBNAME.
|
||||||
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-R*)
|
||||||
|
dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
||||||
|
if test "$enable_rpath" != no; then
|
||||||
|
dnl Potentially add DIR to rpathdirs.
|
||||||
|
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
||||||
|
haveit=
|
||||||
|
for x in $rpathdirs; do
|
||||||
|
if test "X$x" = "X$dir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
rpathdirs="$rpathdirs $dir"
|
||||||
|
fi
|
||||||
|
dnl Potentially add DIR to ltrpathdirs.
|
||||||
|
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
||||||
|
haveit=
|
||||||
|
for x in $ltrpathdirs; do
|
||||||
|
if test "X$x" = "X$dir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
ltrpathdirs="$ltrpathdirs $dir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-l*)
|
||||||
|
dnl Handle this in the next round.
|
||||||
|
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
||||||
|
;;
|
||||||
|
*.la)
|
||||||
|
dnl Handle this in the next round. Throw away the .la's
|
||||||
|
dnl directory; it is already contained in a preceding -L
|
||||||
|
dnl option.
|
||||||
|
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
dnl Most likely an immediate library name.
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
||||||
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
dnl Didn't find the library; assume it is in the system directories
|
||||||
|
dnl known to the linker and runtime loader. (All the system
|
||||||
|
dnl directories known to the linker should also be known to the
|
||||||
|
dnl runtime loader, otherwise the system is severely misconfigured.)
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
||||||
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
if test "X$rpathdirs" != "X"; then
|
||||||
|
if test -n "$acl_hardcode_libdir_separator"; then
|
||||||
|
dnl Weird platform: only the last -rpath option counts, the user must
|
||||||
|
dnl pass all path elements in one option. We can arrange that for a
|
||||||
|
dnl single library, but not when more than one $LIBNAMEs are used.
|
||||||
|
alldirs=
|
||||||
|
for found_dir in $rpathdirs; do
|
||||||
|
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
||||||
|
done
|
||||||
|
dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
|
||||||
|
acl_save_libdir="$libdir"
|
||||||
|
libdir="$alldirs"
|
||||||
|
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||||
|
libdir="$acl_save_libdir"
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
||||||
|
else
|
||||||
|
dnl The -rpath options are cumulative.
|
||||||
|
for found_dir in $rpathdirs; do
|
||||||
|
acl_save_libdir="$libdir"
|
||||||
|
libdir="$found_dir"
|
||||||
|
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||||
|
libdir="$acl_save_libdir"
|
||||||
|
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$ltrpathdirs" != "X"; then
|
||||||
|
dnl When using libtool, the option that works for both libraries and
|
||||||
|
dnl executables is -R. The -R options are cumulative.
|
||||||
|
for found_dir in $ltrpathdirs; do
|
||||||
|
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
popdef([P_A_C_K])
|
||||||
|
popdef([PACKLIBS])
|
||||||
|
popdef([PACKUP])
|
||||||
|
popdef([PACK])
|
||||||
|
popdef([NAME])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
||||||
|
dnl unless already present in VAR.
|
||||||
|
dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
||||||
|
dnl contains two or three consecutive elements that belong together.
|
||||||
|
AC_DEFUN([AC_LIB_APPENDTOVAR],
|
||||||
|
[
|
||||||
|
for element in [$2]; do
|
||||||
|
haveit=
|
||||||
|
for x in $[$1]; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X$element"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
[$1]="${[$1]}${[$1]:+ }$element"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl For those cases where a variable contains several -L and -l options
|
||||||
|
dnl referring to unknown libraries and directories, this macro determines the
|
||||||
|
dnl necessary additional linker options for the runtime path.
|
||||||
|
dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
|
||||||
|
dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
|
||||||
|
dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
|
||||||
|
dnl otherwise linking without libtool is assumed.
|
||||||
|
AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_LIB_RPATH])
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||||
|
$1=
|
||||||
|
if test "$enable_rpath" != no; then
|
||||||
|
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
||||||
|
dnl Use an explicit option to hardcode directories into the resulting
|
||||||
|
dnl binary.
|
||||||
|
rpathdirs=
|
||||||
|
next=
|
||||||
|
for opt in $2; do
|
||||||
|
if test -n "$next"; then
|
||||||
|
dir="$next"
|
||||||
|
dnl No need to hardcode the standard /usr/lib.
|
||||||
|
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
||||||
|
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
||||||
|
rpathdirs="$rpathdirs $dir"
|
||||||
|
fi
|
||||||
|
next=
|
||||||
|
else
|
||||||
|
case $opt in
|
||||||
|
-L) next=yes ;;
|
||||||
|
-L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
|
||||||
|
dnl No need to hardcode the standard /usr/lib.
|
||||||
|
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
||||||
|
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
||||||
|
rpathdirs="$rpathdirs $dir"
|
||||||
|
fi
|
||||||
|
next= ;;
|
||||||
|
*) next= ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test "X$rpathdirs" != "X"; then
|
||||||
|
if test -n ""$3""; then
|
||||||
|
dnl libtool is used for linking. Use -R options.
|
||||||
|
for dir in $rpathdirs; do
|
||||||
|
$1="${$1}${$1:+ }-R$dir"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
dnl The linker is used for linking directly.
|
||||||
|
if test -n "$acl_hardcode_libdir_separator"; then
|
||||||
|
dnl Weird platform: only the last -rpath option counts, the user
|
||||||
|
dnl must pass all path elements in one option.
|
||||||
|
alldirs=
|
||||||
|
for dir in $rpathdirs; do
|
||||||
|
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
|
||||||
|
done
|
||||||
|
acl_save_libdir="$libdir"
|
||||||
|
libdir="$alldirs"
|
||||||
|
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||||
|
libdir="$acl_save_libdir"
|
||||||
|
$1="$flag"
|
||||||
|
else
|
||||||
|
dnl The -rpath options are cumulative.
|
||||||
|
for dir in $rpathdirs; do
|
||||||
|
acl_save_libdir="$libdir"
|
||||||
|
libdir="$dir"
|
||||||
|
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||||
|
libdir="$acl_save_libdir"
|
||||||
|
$1="${$1}${$1:+ }$flag"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_SUBST([$1])
|
||||||
|
])
|
||||||
224
dist/xkeyboard-config/m4/lib-prefix.m4
vendored
Normal file
224
dist/xkeyboard-config/m4/lib-prefix.m4
vendored
Normal file
@ -0,0 +1,224 @@
|
|||||||
|
# lib-prefix.m4 serial 7 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
|
||||||
|
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
|
||||||
|
dnl require excessive bracketing.
|
||||||
|
ifdef([AC_HELP_STRING],
|
||||||
|
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
|
||||||
|
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
|
||||||
|
|
||||||
|
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
||||||
|
dnl to access previously installed libraries. The basic assumption is that
|
||||||
|
dnl a user will want packages to use other packages he previously installed
|
||||||
|
dnl with the same --prefix option.
|
||||||
|
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
||||||
|
dnl libraries, but is otherwise very convenient.
|
||||||
|
AC_DEFUN([AC_LIB_PREFIX],
|
||||||
|
[
|
||||||
|
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
||||||
|
AC_REQUIRE([AC_PROG_CC])
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||||
|
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||||
|
dnl By default, look in $includedir and $libdir.
|
||||||
|
use_additional=yes
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([
|
||||||
|
eval additional_includedir=\"$includedir\"
|
||||||
|
eval additional_libdir=\"$libdir\"
|
||||||
|
])
|
||||||
|
AC_LIB_ARG_WITH([lib-prefix],
|
||||||
|
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
||||||
|
--without-lib-prefix don't search for libraries in includedir and libdir],
|
||||||
|
[
|
||||||
|
if test "X$withval" = "Xno"; then
|
||||||
|
use_additional=no
|
||||||
|
else
|
||||||
|
if test "X$withval" = "X"; then
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([
|
||||||
|
eval additional_includedir=\"$includedir\"
|
||||||
|
eval additional_libdir=\"$libdir\"
|
||||||
|
])
|
||||||
|
else
|
||||||
|
additional_includedir="$withval/include"
|
||||||
|
additional_libdir="$withval/$acl_libdirstem"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
if test $use_additional = yes; then
|
||||||
|
dnl Potentially add $additional_includedir to $CPPFLAGS.
|
||||||
|
dnl But don't add it
|
||||||
|
dnl 1. if it's the standard /usr/include,
|
||||||
|
dnl 2. if it's already present in $CPPFLAGS,
|
||||||
|
dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
||||||
|
dnl 4. if it doesn't exist as a directory.
|
||||||
|
if test "X$additional_includedir" != "X/usr/include"; then
|
||||||
|
haveit=
|
||||||
|
for x in $CPPFLAGS; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-I$additional_includedir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
case $host_os in
|
||||||
|
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test -d "$additional_includedir"; then
|
||||||
|
dnl Really add $additional_includedir to $CPPFLAGS.
|
||||||
|
CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
dnl Potentially add $additional_libdir to $LDFLAGS.
|
||||||
|
dnl But don't add it
|
||||||
|
dnl 1. if it's the standard /usr/lib,
|
||||||
|
dnl 2. if it's already present in $LDFLAGS,
|
||||||
|
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
||||||
|
dnl 4. if it doesn't exist as a directory.
|
||||||
|
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
|
||||||
|
haveit=
|
||||||
|
for x in $LDFLAGS; do
|
||||||
|
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||||
|
if test "X$x" = "X-L$additional_libdir"; then
|
||||||
|
haveit=yes
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
|
||||||
|
if test -n "$GCC"; then
|
||||||
|
case $host_os in
|
||||||
|
linux*) haveit=yes;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -z "$haveit"; then
|
||||||
|
if test -d "$additional_libdir"; then
|
||||||
|
dnl Really add $additional_libdir to $LDFLAGS.
|
||||||
|
LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
||||||
|
dnl acl_final_exec_prefix, containing the values to which $prefix and
|
||||||
|
dnl $exec_prefix will expand at the end of the configure script.
|
||||||
|
AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
||||||
|
[
|
||||||
|
dnl Unfortunately, prefix and exec_prefix get only finally determined
|
||||||
|
dnl at the end of configure.
|
||||||
|
if test "X$prefix" = "XNONE"; then
|
||||||
|
acl_final_prefix="$ac_default_prefix"
|
||||||
|
else
|
||||||
|
acl_final_prefix="$prefix"
|
||||||
|
fi
|
||||||
|
if test "X$exec_prefix" = "XNONE"; then
|
||||||
|
acl_final_exec_prefix='${prefix}'
|
||||||
|
else
|
||||||
|
acl_final_exec_prefix="$exec_prefix"
|
||||||
|
fi
|
||||||
|
acl_save_prefix="$prefix"
|
||||||
|
prefix="$acl_final_prefix"
|
||||||
|
eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
||||||
|
prefix="$acl_save_prefix"
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
||||||
|
dnl variables prefix and exec_prefix bound to the values they will have
|
||||||
|
dnl at the end of the configure script.
|
||||||
|
AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
||||||
|
[
|
||||||
|
acl_save_prefix="$prefix"
|
||||||
|
prefix="$acl_final_prefix"
|
||||||
|
acl_save_exec_prefix="$exec_prefix"
|
||||||
|
exec_prefix="$acl_final_exec_prefix"
|
||||||
|
$1
|
||||||
|
exec_prefix="$acl_save_exec_prefix"
|
||||||
|
prefix="$acl_save_prefix"
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl AC_LIB_PREPARE_MULTILIB creates
|
||||||
|
dnl - a variable acl_libdirstem, containing the basename of the libdir, either
|
||||||
|
dnl "lib" or "lib64" or "lib/64",
|
||||||
|
dnl - a variable acl_libdirstem2, as a secondary possible value for
|
||||||
|
dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
|
||||||
|
dnl "lib/amd64".
|
||||||
|
AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
|
||||||
|
[
|
||||||
|
dnl There is no formal standard regarding lib and lib64.
|
||||||
|
dnl On glibc systems, the current practice is that on a system supporting
|
||||||
|
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
||||||
|
dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
|
||||||
|
dnl the compiler's default mode by looking at the compiler's library search
|
||||||
|
dnl path. If at least one of its elements ends in /lib64 or points to a
|
||||||
|
dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
|
||||||
|
dnl Otherwise we use the default, namely "lib".
|
||||||
|
dnl On Solaris systems, the current practice is that on a system supporting
|
||||||
|
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
||||||
|
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
|
||||||
|
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
acl_libdirstem=lib
|
||||||
|
acl_libdirstem2=
|
||||||
|
case "$host_os" in
|
||||||
|
solaris*)
|
||||||
|
dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
|
||||||
|
dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
|
||||||
|
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
|
||||||
|
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
|
||||||
|
dnl symlink is missing, so we set acl_libdirstem2 too.
|
||||||
|
AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
|
||||||
|
[AC_EGREP_CPP([sixtyfour bits], [
|
||||||
|
#ifdef _LP64
|
||||||
|
sixtyfour bits
|
||||||
|
#endif
|
||||||
|
], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
|
||||||
|
])
|
||||||
|
if test $gl_cv_solaris_64bit = yes; then
|
||||||
|
acl_libdirstem=lib/64
|
||||||
|
case "$host_cpu" in
|
||||||
|
sparc*) acl_libdirstem2=lib/sparcv9 ;;
|
||||||
|
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
||||||
|
if test -n "$searchpath"; then
|
||||||
|
acl_save_IFS="${IFS= }"; IFS=":"
|
||||||
|
for searchdir in $searchpath; do
|
||||||
|
if test -d "$searchdir"; then
|
||||||
|
case "$searchdir" in
|
||||||
|
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
||||||
|
*/../ | */.. )
|
||||||
|
# Better ignore directories of this form. They are misleading.
|
||||||
|
;;
|
||||||
|
*) searchdir=`cd "$searchdir" && pwd`
|
||||||
|
case "$searchdir" in
|
||||||
|
*/lib64 ) acl_libdirstem=lib64 ;;
|
||||||
|
esac ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$acl_save_IFS"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
|
||||||
|
])
|
||||||
32
dist/xkeyboard-config/m4/nls.m4
vendored
Normal file
32
dist/xkeyboard-config/m4/nls.m4
vendored
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# nls.m4 serial 5 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
|
||||||
|
dnl Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
dnl This file can can be used in projects which are not available under
|
||||||
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
|
dnl License but which still want to provide support for the GNU gettext
|
||||||
|
dnl functionality.
|
||||||
|
dnl Please note that the actual code of the GNU gettext library is covered
|
||||||
|
dnl by the GNU Library General Public License, and the rest of the GNU
|
||||||
|
dnl gettext package package is covered by the GNU General Public License.
|
||||||
|
dnl They are *not* in the public domain.
|
||||||
|
|
||||||
|
dnl Authors:
|
||||||
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
||||||
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
||||||
|
|
||||||
|
AC_PREREQ([2.50])
|
||||||
|
|
||||||
|
AC_DEFUN([AM_NLS],
|
||||||
|
[
|
||||||
|
AC_MSG_CHECKING([whether NLS is requested])
|
||||||
|
dnl Default is enabled NLS
|
||||||
|
AC_ARG_ENABLE([nls],
|
||||||
|
[ --disable-nls do not use Native Language Support],
|
||||||
|
USE_NLS=$enableval, USE_NLS=yes)
|
||||||
|
AC_MSG_RESULT([$USE_NLS])
|
||||||
|
AC_SUBST([USE_NLS])
|
||||||
|
])
|
||||||
449
dist/xkeyboard-config/m4/po.m4
vendored
Normal file
449
dist/xkeyboard-config/m4/po.m4
vendored
Normal file
@ -0,0 +1,449 @@
|
|||||||
|
# po.m4 serial 17 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
dnl This file can can be used in projects which are not available under
|
||||||
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
|
dnl License but which still want to provide support for the GNU gettext
|
||||||
|
dnl functionality.
|
||||||
|
dnl Please note that the actual code of the GNU gettext library is covered
|
||||||
|
dnl by the GNU Library General Public License, and the rest of the GNU
|
||||||
|
dnl gettext package package is covered by the GNU General Public License.
|
||||||
|
dnl They are *not* in the public domain.
|
||||||
|
|
||||||
|
dnl Authors:
|
||||||
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
||||||
|
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
||||||
|
|
||||||
|
AC_PREREQ([2.50])
|
||||||
|
|
||||||
|
dnl Checks for all prerequisites of the po subdirectory.
|
||||||
|
AC_DEFUN([AM_PO_SUBDIRS],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||||
|
AC_REQUIRE([AC_PROG_INSTALL])dnl
|
||||||
|
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
|
||||||
|
AC_REQUIRE([AM_NLS])dnl
|
||||||
|
|
||||||
|
dnl Release version of the gettext macros. This is used to ensure that
|
||||||
|
dnl the gettext macros and po/Makefile.in.in are in sync.
|
||||||
|
AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
|
||||||
|
|
||||||
|
dnl Perform the following tests also if --disable-nls has been given,
|
||||||
|
dnl because they are needed for "make dist" to work.
|
||||||
|
|
||||||
|
dnl Search for GNU msgfmt in the PATH.
|
||||||
|
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
||||||
|
dnl The second test excludes FreeBSD msgfmt.
|
||||||
|
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||||
|
[$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
|
||||||
|
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
||||||
|
:)
|
||||||
|
AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
|
||||||
|
|
||||||
|
dnl Test whether it is GNU msgfmt >= 0.15.
|
||||||
|
changequote(,)dnl
|
||||||
|
case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
|
||||||
|
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
|
||||||
|
*) MSGFMT_015=$MSGFMT ;;
|
||||||
|
esac
|
||||||
|
changequote([,])dnl
|
||||||
|
AC_SUBST([MSGFMT_015])
|
||||||
|
changequote(,)dnl
|
||||||
|
case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
|
||||||
|
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
|
||||||
|
*) GMSGFMT_015=$GMSGFMT ;;
|
||||||
|
esac
|
||||||
|
changequote([,])dnl
|
||||||
|
AC_SUBST([GMSGFMT_015])
|
||||||
|
|
||||||
|
dnl Search for GNU xgettext 0.12 or newer in the PATH.
|
||||||
|
dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
||||||
|
dnl The second test excludes FreeBSD xgettext.
|
||||||
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||||
|
[$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
|
||||||
|
(if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
||||||
|
:)
|
||||||
|
dnl Remove leftover from FreeBSD xgettext call.
|
||||||
|
rm -f messages.po
|
||||||
|
|
||||||
|
dnl Test whether it is GNU xgettext >= 0.15.
|
||||||
|
changequote(,)dnl
|
||||||
|
case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
|
||||||
|
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
|
||||||
|
*) XGETTEXT_015=$XGETTEXT ;;
|
||||||
|
esac
|
||||||
|
changequote([,])dnl
|
||||||
|
AC_SUBST([XGETTEXT_015])
|
||||||
|
|
||||||
|
dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
||||||
|
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
||||||
|
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
|
||||||
|
|
||||||
|
dnl Installation directories.
|
||||||
|
dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
|
||||||
|
dnl have to define it here, so that it can be used in po/Makefile.
|
||||||
|
test -n "$localedir" || localedir='${datadir}/locale'
|
||||||
|
AC_SUBST([localedir])
|
||||||
|
|
||||||
|
dnl Support for AM_XGETTEXT_OPTION.
|
||||||
|
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
|
||||||
|
AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
|
||||||
|
|
||||||
|
AC_CONFIG_COMMANDS([po-directories], [[
|
||||||
|
for ac_file in $CONFIG_FILES; do
|
||||||
|
# Support "outfile[:infile[:infile...]]"
|
||||||
|
case "$ac_file" in
|
||||||
|
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
||||||
|
esac
|
||||||
|
# PO directories have a Makefile.in generated from Makefile.in.in.
|
||||||
|
case "$ac_file" in */Makefile.in)
|
||||||
|
# Adjust a relative srcdir.
|
||||||
|
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
||||||
|
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
||||||
|
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
||||||
|
# In autoconf-2.13 it is called $ac_given_srcdir.
|
||||||
|
# In autoconf-2.50 it is called $srcdir.
|
||||||
|
test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
||||||
|
case "$ac_given_srcdir" in
|
||||||
|
.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
||||||
|
/*) top_srcdir="$ac_given_srcdir" ;;
|
||||||
|
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
||||||
|
esac
|
||||||
|
# Treat a directory as a PO directory if and only if it has a
|
||||||
|
# POTFILES.in file. This allows packages to have multiple PO
|
||||||
|
# directories under different names or in different locations.
|
||||||
|
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
||||||
|
rm -f "$ac_dir/POTFILES"
|
||||||
|
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
||||||
|
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
||||||
|
POMAKEFILEDEPS="POTFILES.in"
|
||||||
|
# ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
|
||||||
|
# on $ac_dir but don't depend on user-specified configuration
|
||||||
|
# parameters.
|
||||||
|
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
||||||
|
# The LINGUAS file contains the set of available languages.
|
||||||
|
if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
||||||
|
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
||||||
|
fi
|
||||||
|
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
||||||
|
# Hide the ALL_LINGUAS assigment from automake < 1.5.
|
||||||
|
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
||||||
|
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
||||||
|
else
|
||||||
|
# The set of available languages was given in configure.in.
|
||||||
|
# Hide the ALL_LINGUAS assigment from automake < 1.5.
|
||||||
|
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
|
||||||
|
fi
|
||||||
|
# Compute POFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
|
||||||
|
# Compute UPDATEPOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
|
||||||
|
# Compute DUMMYPOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
|
||||||
|
# Compute GMOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
|
||||||
|
case "$ac_given_srcdir" in
|
||||||
|
.) srcdirpre= ;;
|
||||||
|
*) srcdirpre='$(srcdir)/' ;;
|
||||||
|
esac
|
||||||
|
POFILES=
|
||||||
|
UPDATEPOFILES=
|
||||||
|
DUMMYPOFILES=
|
||||||
|
GMOFILES=
|
||||||
|
for lang in $ALL_LINGUAS; do
|
||||||
|
POFILES="$POFILES $srcdirpre$lang.po"
|
||||||
|
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
||||||
|
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
||||||
|
GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
||||||
|
done
|
||||||
|
# CATALOGS depends on both $ac_dir and the user's LINGUAS
|
||||||
|
# environment variable.
|
||||||
|
INST_LINGUAS=
|
||||||
|
if test -n "$ALL_LINGUAS"; then
|
||||||
|
for presentlang in $ALL_LINGUAS; do
|
||||||
|
useit=no
|
||||||
|
if test "%UNSET%" != "$LINGUAS"; then
|
||||||
|
desiredlanguages="$LINGUAS"
|
||||||
|
else
|
||||||
|
desiredlanguages="$ALL_LINGUAS"
|
||||||
|
fi
|
||||||
|
for desiredlang in $desiredlanguages; do
|
||||||
|
# Use the presentlang catalog if desiredlang is
|
||||||
|
# a. equal to presentlang, or
|
||||||
|
# b. a variant of presentlang (because in this case,
|
||||||
|
# presentlang can be used as a fallback for messages
|
||||||
|
# which are not translated in the desiredlang catalog).
|
||||||
|
case "$desiredlang" in
|
||||||
|
"$presentlang"*) useit=yes;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
if test $useit = yes; then
|
||||||
|
INST_LINGUAS="$INST_LINGUAS $presentlang"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
CATALOGS=
|
||||||
|
if test -n "$INST_LINGUAS"; then
|
||||||
|
for lang in $INST_LINGUAS; do
|
||||||
|
CATALOGS="$CATALOGS $lang.gmo"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
||||||
|
sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
||||||
|
for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
||||||
|
if test -f "$f"; then
|
||||||
|
case "$f" in
|
||||||
|
*.orig | *.bak | *~) ;;
|
||||||
|
*) cat "$f" >> "$ac_dir/Makefile" ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done]],
|
||||||
|
[# Capture the value of obsolete ALL_LINGUAS because we need it to compute
|
||||||
|
# POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
|
||||||
|
# from automake < 1.5.
|
||||||
|
eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
|
||||||
|
# Capture the value of LINGUAS because we need it to compute CATALOGS.
|
||||||
|
LINGUAS="${LINGUAS-%UNSET%}"
|
||||||
|
])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Postprocesses a Makefile in a directory containing PO files.
|
||||||
|
AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
|
||||||
|
[
|
||||||
|
# When this code is run, in config.status, two variables have already been
|
||||||
|
# set:
|
||||||
|
# - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
|
||||||
|
# - LINGUAS is the value of the environment variable LINGUAS at configure
|
||||||
|
# time.
|
||||||
|
|
||||||
|
changequote(,)dnl
|
||||||
|
# Adjust a relative srcdir.
|
||||||
|
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
||||||
|
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
||||||
|
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
||||||
|
# In autoconf-2.13 it is called $ac_given_srcdir.
|
||||||
|
# In autoconf-2.50 it is called $srcdir.
|
||||||
|
test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
||||||
|
case "$ac_given_srcdir" in
|
||||||
|
.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
||||||
|
/*) top_srcdir="$ac_given_srcdir" ;;
|
||||||
|
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Find a way to echo strings without interpreting backslash.
|
||||||
|
if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
|
||||||
|
gt_echo='echo'
|
||||||
|
else
|
||||||
|
if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
|
||||||
|
gt_echo='printf %s\n'
|
||||||
|
else
|
||||||
|
echo_func () {
|
||||||
|
cat <<EOT
|
||||||
|
$*
|
||||||
|
EOT
|
||||||
|
}
|
||||||
|
gt_echo='echo_func'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# A sed script that extracts the value of VARIABLE from a Makefile.
|
||||||
|
sed_x_variable='
|
||||||
|
# Test if the hold space is empty.
|
||||||
|
x
|
||||||
|
s/P/P/
|
||||||
|
x
|
||||||
|
ta
|
||||||
|
# Yes it was empty. Look if we have the expected variable definition.
|
||||||
|
/^[ ]*VARIABLE[ ]*=/{
|
||||||
|
# Seen the first line of the variable definition.
|
||||||
|
s/^[ ]*VARIABLE[ ]*=//
|
||||||
|
ba
|
||||||
|
}
|
||||||
|
bd
|
||||||
|
:a
|
||||||
|
# Here we are processing a line from the variable definition.
|
||||||
|
# Remove comment, more precisely replace it with a space.
|
||||||
|
s/#.*$/ /
|
||||||
|
# See if the line ends in a backslash.
|
||||||
|
tb
|
||||||
|
:b
|
||||||
|
s/\\$//
|
||||||
|
# Print the line, without the trailing backslash.
|
||||||
|
p
|
||||||
|
tc
|
||||||
|
# There was no trailing backslash. The end of the variable definition is
|
||||||
|
# reached. Clear the hold space.
|
||||||
|
s/^.*$//
|
||||||
|
x
|
||||||
|
bd
|
||||||
|
:c
|
||||||
|
# A trailing backslash means that the variable definition continues in the
|
||||||
|
# next line. Put a nonempty string into the hold space to indicate this.
|
||||||
|
s/^.*$/P/
|
||||||
|
x
|
||||||
|
:d
|
||||||
|
'
|
||||||
|
changequote([,])dnl
|
||||||
|
|
||||||
|
# Set POTFILES to the value of the Makefile variable POTFILES.
|
||||||
|
sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
|
||||||
|
POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
|
||||||
|
# Compute POTFILES_DEPS as
|
||||||
|
# $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
|
||||||
|
POTFILES_DEPS=
|
||||||
|
for file in $POTFILES; do
|
||||||
|
POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
|
||||||
|
done
|
||||||
|
POMAKEFILEDEPS=""
|
||||||
|
|
||||||
|
if test -n "$OBSOLETE_ALL_LINGUAS"; then
|
||||||
|
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
||||||
|
fi
|
||||||
|
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
||||||
|
# The LINGUAS file contains the set of available languages.
|
||||||
|
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
||||||
|
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
|
||||||
|
else
|
||||||
|
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
|
||||||
|
sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
|
||||||
|
ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
|
||||||
|
fi
|
||||||
|
# Hide the ALL_LINGUAS assigment from automake < 1.5.
|
||||||
|
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
||||||
|
# Compute POFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
|
||||||
|
# Compute UPDATEPOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
|
||||||
|
# Compute DUMMYPOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
|
||||||
|
# Compute GMOFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
|
||||||
|
# Compute PROPERTIESFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
|
||||||
|
# Compute CLASSFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
|
||||||
|
# Compute QMFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
|
||||||
|
# Compute MSGFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
|
||||||
|
# Compute RESOURCESDLLFILES
|
||||||
|
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
|
||||||
|
case "$ac_given_srcdir" in
|
||||||
|
.) srcdirpre= ;;
|
||||||
|
*) srcdirpre='$(srcdir)/' ;;
|
||||||
|
esac
|
||||||
|
POFILES=
|
||||||
|
UPDATEPOFILES=
|
||||||
|
DUMMYPOFILES=
|
||||||
|
GMOFILES=
|
||||||
|
PROPERTIESFILES=
|
||||||
|
CLASSFILES=
|
||||||
|
QMFILES=
|
||||||
|
MSGFILES=
|
||||||
|
RESOURCESDLLFILES=
|
||||||
|
for lang in $ALL_LINGUAS; do
|
||||||
|
POFILES="$POFILES $srcdirpre$lang.po"
|
||||||
|
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
||||||
|
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
||||||
|
GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
||||||
|
PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
|
||||||
|
CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
|
||||||
|
QMFILES="$QMFILES $srcdirpre$lang.qm"
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
||||||
|
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
|
RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
|
||||||
|
done
|
||||||
|
# CATALOGS depends on both $ac_dir and the user's LINGUAS
|
||||||
|
# environment variable.
|
||||||
|
INST_LINGUAS=
|
||||||
|
if test -n "$ALL_LINGUAS"; then
|
||||||
|
for presentlang in $ALL_LINGUAS; do
|
||||||
|
useit=no
|
||||||
|
if test "%UNSET%" != "$LINGUAS"; then
|
||||||
|
desiredlanguages="$LINGUAS"
|
||||||
|
else
|
||||||
|
desiredlanguages="$ALL_LINGUAS"
|
||||||
|
fi
|
||||||
|
for desiredlang in $desiredlanguages; do
|
||||||
|
# Use the presentlang catalog if desiredlang is
|
||||||
|
# a. equal to presentlang, or
|
||||||
|
# b. a variant of presentlang (because in this case,
|
||||||
|
# presentlang can be used as a fallback for messages
|
||||||
|
# which are not translated in the desiredlang catalog).
|
||||||
|
case "$desiredlang" in
|
||||||
|
"$presentlang"*) useit=yes;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
if test $useit = yes; then
|
||||||
|
INST_LINGUAS="$INST_LINGUAS $presentlang"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
CATALOGS=
|
||||||
|
JAVACATALOGS=
|
||||||
|
QTCATALOGS=
|
||||||
|
TCLCATALOGS=
|
||||||
|
CSHARPCATALOGS=
|
||||||
|
if test -n "$INST_LINGUAS"; then
|
||||||
|
for lang in $INST_LINGUAS; do
|
||||||
|
CATALOGS="$CATALOGS $lang.gmo"
|
||||||
|
JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
|
||||||
|
QTCATALOGS="$QTCATALOGS $lang.qm"
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
||||||
|
TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
|
CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
|
||||||
|
if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
|
||||||
|
# Add dependencies that cannot be formulated as a simple suffix rule.
|
||||||
|
for lang in $ALL_LINGUAS; do
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
|
||||||
|
cat >> "$ac_file.tmp" <<EOF
|
||||||
|
$frobbedlang.msg: $lang.po
|
||||||
|
@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
|
||||||
|
\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
|
||||||
|
EOF
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
|
||||||
|
# Add dependencies that cannot be formulated as a simple suffix rule.
|
||||||
|
for lang in $ALL_LINGUAS; do
|
||||||
|
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
|
||||||
|
cat >> "$ac_file.tmp" <<EOF
|
||||||
|
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
|
||||||
|
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
|
||||||
|
\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
|
||||||
|
EOF
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
if test -n "$POMAKEFILEDEPS"; then
|
||||||
|
cat >> "$ac_file.tmp" <<EOF
|
||||||
|
Makefile: $POMAKEFILEDEPS
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
mv "$ac_file.tmp" "$ac_file"
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
|
||||||
|
AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
|
||||||
|
[
|
||||||
|
XGETTEXT_EXTRA_OPTIONS=
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl Registers an option to be passed to xgettext in the po subdirectory.
|
||||||
|
AC_DEFUN([AM_XGETTEXT_OPTION],
|
||||||
|
[
|
||||||
|
AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
|
||||||
|
XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
|
||||||
|
])
|
||||||
92
dist/xkeyboard-config/m4/progtest.m4
vendored
Normal file
92
dist/xkeyboard-config/m4/progtest.m4
vendored
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
# progtest.m4 serial 6 (gettext-0.18)
|
||||||
|
dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
dnl
|
||||||
|
dnl This file can can be used in projects which are not available under
|
||||||
|
dnl the GNU General Public License or the GNU Library General Public
|
||||||
|
dnl License but which still want to provide support for the GNU gettext
|
||||||
|
dnl functionality.
|
||||||
|
dnl Please note that the actual code of the GNU gettext library is covered
|
||||||
|
dnl by the GNU Library General Public License, and the rest of the GNU
|
||||||
|
dnl gettext package package is covered by the GNU General Public License.
|
||||||
|
dnl They are *not* in the public domain.
|
||||||
|
|
||||||
|
dnl Authors:
|
||||||
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
|
||||||
|
|
||||||
|
AC_PREREQ([2.50])
|
||||||
|
|
||||||
|
# Search path for a program which passes the given test.
|
||||||
|
|
||||||
|
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
||||||
|
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
||||||
|
AC_DEFUN([AM_PATH_PROG_WITH_TEST],
|
||||||
|
[
|
||||||
|
# Prepare PATH_SEPARATOR.
|
||||||
|
# The user is always right.
|
||||||
|
if test "${PATH_SEPARATOR+set}" != set; then
|
||||||
|
echo "#! /bin/sh" >conf$$.sh
|
||||||
|
echo "exit 0" >>conf$$.sh
|
||||||
|
chmod +x conf$$.sh
|
||||||
|
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||||||
|
PATH_SEPARATOR=';'
|
||||||
|
else
|
||||||
|
PATH_SEPARATOR=:
|
||||||
|
fi
|
||||||
|
rm -f conf$$.sh
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Find out how to test for executable files. Don't use a zero-byte file,
|
||||||
|
# as systems may use methods other than mode bits to determine executability.
|
||||||
|
cat >conf$$.file <<_ASEOF
|
||||||
|
#! /bin/sh
|
||||||
|
exit 0
|
||||||
|
_ASEOF
|
||||||
|
chmod +x conf$$.file
|
||||||
|
if test -x conf$$.file >/dev/null 2>&1; then
|
||||||
|
ac_executable_p="test -x"
|
||||||
|
else
|
||||||
|
ac_executable_p="test -f"
|
||||||
|
fi
|
||||||
|
rm -f conf$$.file
|
||||||
|
|
||||||
|
# Extract the first word of "$2", so it can be a program name with args.
|
||||||
|
set dummy $2; ac_word=[$]2
|
||||||
|
AC_MSG_CHECKING([for $ac_word])
|
||||||
|
AC_CACHE_VAL([ac_cv_path_$1],
|
||||||
|
[case "[$]$1" in
|
||||||
|
[[\\/]]* | ?:[[\\/]]*)
|
||||||
|
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
|
||||||
|
for ac_dir in ifelse([$5], , $PATH, [$5]); do
|
||||||
|
IFS="$ac_save_IFS"
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
|
||||||
|
echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
|
||||||
|
if [$3]; then
|
||||||
|
ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS="$ac_save_IFS"
|
||||||
|
dnl If no 4th arg is given, leave the cache variable unset,
|
||||||
|
dnl so AC_PATH_PROGS will keep looking.
|
||||||
|
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
|
||||||
|
])dnl
|
||||||
|
;;
|
||||||
|
esac])dnl
|
||||||
|
$1="$ac_cv_path_$1"
|
||||||
|
if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
|
||||||
|
AC_MSG_RESULT([$][$1])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
fi
|
||||||
|
AC_SUBST([$1])dnl
|
||||||
|
])
|
||||||
1797
dist/xkeyboard-config/po/bg.po
vendored
1797
dist/xkeyboard-config/po/bg.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/ca.po
vendored
1500
dist/xkeyboard-config/po/ca.po
vendored
File diff suppressed because it is too large
Load Diff
1502
dist/xkeyboard-config/po/cs.po
vendored
1502
dist/xkeyboard-config/po/cs.po
vendored
File diff suppressed because it is too large
Load Diff
1502
dist/xkeyboard-config/po/de.po
vendored
1502
dist/xkeyboard-config/po/de.po
vendored
File diff suppressed because it is too large
Load Diff
1627
dist/xkeyboard-config/po/fi.po
vendored
1627
dist/xkeyboard-config/po/fi.po
vendored
File diff suppressed because it is too large
Load Diff
1501
dist/xkeyboard-config/po/fr.po
vendored
1501
dist/xkeyboard-config/po/fr.po
vendored
File diff suppressed because it is too large
Load Diff
1769
dist/xkeyboard-config/po/gl.po
vendored
1769
dist/xkeyboard-config/po/gl.po
vendored
File diff suppressed because it is too large
Load Diff
1773
dist/xkeyboard-config/po/hu.po
vendored
1773
dist/xkeyboard-config/po/hu.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/ko.po
vendored
1500
dist/xkeyboard-config/po/ko.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/nl.po
vendored
1500
dist/xkeyboard-config/po/nl.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/pl.po
vendored
1500
dist/xkeyboard-config/po/pl.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/ru.po
vendored
1500
dist/xkeyboard-config/po/ru.po
vendored
File diff suppressed because it is too large
Load Diff
1504
dist/xkeyboard-config/po/sv.po
vendored
1504
dist/xkeyboard-config/po/sv.po
vendored
File diff suppressed because it is too large
Load Diff
1500
dist/xkeyboard-config/po/uk.po
vendored
1500
dist/xkeyboard-config/po/uk.po
vendored
File diff suppressed because it is too large
Load Diff
2130
dist/xkeyboard-config/po/vi.po
vendored
2130
dist/xkeyboard-config/po/vi.po
vendored
File diff suppressed because it is too large
Load Diff
@ -140,6 +140,12 @@
|
|||||||
<_description>German (Aus der Neo-Welt)</_description>
|
<_description>German (Aus der Neo-Welt)</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>koy</name>
|
||||||
|
<_description>German (KOY)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
</variantList>
|
</variantList>
|
||||||
</layout>
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
|
|||||||
3
dist/xkeyboard-config/rules/base.lists.part
vendored
3
dist/xkeyboard-config/rules/base.lists.part
vendored
@ -8,6 +8,9 @@
|
|||||||
// PC models
|
// PC models
|
||||||
! $pcmodels = pc101 pc102 pc104 pc105
|
! $pcmodels = pc101 pc102 pc104 pc105
|
||||||
|
|
||||||
|
// Jolla devices and keyboards
|
||||||
|
! $jollamodels = jollasbj
|
||||||
|
|
||||||
// Microsoft models (using MS geometry)
|
// Microsoft models (using MS geometry)
|
||||||
! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
|
! $msmodels = microsoft microsoft4000 microsoft7000 microsoftpro microsoftprousb microsoftprose
|
||||||
|
|
||||||
|
|||||||
1
dist/xkeyboard-config/rules/base.ml1_s.part
vendored
1
dist/xkeyboard-config/rules/base.ml1_s.part
vendored
@ -1,5 +1,6 @@
|
|||||||
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
|
ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1])
|
||||||
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
|
amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1])
|
||||||
|
jollasbj * = jolla_vndr/sbj(common)+%l[1]%(v[1])
|
||||||
$sun $sun_custom = pc+sun_vndr/%l[1]%(v[1])
|
$sun $sun_custom = pc+sun_vndr/%l[1]%(v[1])
|
||||||
macintosh_old us = macintosh_vndr/us(oldmac)
|
macintosh_old us = macintosh_vndr/us(oldmac)
|
||||||
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
|
macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1])
|
||||||
|
|||||||
2
dist/xkeyboard-config/rules/base.ml_s.part
vendored
2
dist/xkeyboard-config/rules/base.ml_s.part
vendored
@ -5,6 +5,8 @@
|
|||||||
classmate us = pc+%l(classmate)
|
classmate us = pc+%l(classmate)
|
||||||
empty * = empty(basic)
|
empty * = empty(basic)
|
||||||
* empty = empty(basic)
|
* empty = empty(basic)
|
||||||
|
jollasbj $nonlatin = jolla_vndr/sbj(common)+us+%l%(v):2
|
||||||
|
jollasbj * = jolla_vndr/sbj(common)+%l%(v)
|
||||||
$sun $sun_custom = pc+sun_vndr/%l%(v)
|
$sun $sun_custom = pc+sun_vndr/%l%(v)
|
||||||
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
|
pc98 nec_vndr/jp = nec_vndr/jp(pc98)
|
||||||
macintosh_old us = macintosh_vndr/us(oldmac)
|
macintosh_old us = macintosh_vndr/us(oldmac)
|
||||||
|
|||||||
2
dist/xkeyboard-config/rules/base.o_s.part
vendored
2
dist/xkeyboard-config/rules/base.o_s.part
vendored
@ -9,6 +9,7 @@
|
|||||||
altwin:alt_super_win = +altwin(alt_super_win)
|
altwin:alt_super_win = +altwin(alt_super_win)
|
||||||
altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
|
altwin:swap_lalt_lwin = +altwin(swap_lalt_lwin)
|
||||||
altwin:swap_alt_win = +altwin(swap_alt_win)
|
altwin:swap_alt_win = +altwin(swap_alt_win)
|
||||||
|
altwin:prtsc_rwin = +altwin(prtsc_rwin)
|
||||||
grab:debug = +srvr_ctrl(grab_debug)
|
grab:debug = +srvr_ctrl(grab_debug)
|
||||||
grp:switch = +group(switch)
|
grp:switch = +group(switch)
|
||||||
grp:lswitch = +group(lswitch)
|
grp:lswitch = +group(lswitch)
|
||||||
@ -70,6 +71,7 @@
|
|||||||
caps:backspace = +capslock(backspace)
|
caps:backspace = +capslock(backspace)
|
||||||
caps:super = +capslock(super)
|
caps:super = +capslock(super)
|
||||||
caps:hyper = +capslock(hyper)
|
caps:hyper = +capslock(hyper)
|
||||||
|
caps:menu = +capslock(menu)
|
||||||
caps:none = +capslock(none)
|
caps:none = +capslock(none)
|
||||||
caps:ctrl_modifier = +capslock(ctrl_modifier)
|
caps:ctrl_modifier = +capslock(ctrl_modifier)
|
||||||
ctrl:nocaps = +ctrl(nocaps)
|
ctrl:nocaps = +ctrl(nocaps)
|
||||||
|
|||||||
34
dist/xkeyboard-config/rules/base.xml.in
vendored
34
dist/xkeyboard-config/rules/base.xml.in
vendored
@ -2272,6 +2272,12 @@
|
|||||||
</languageList>
|
</languageList>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>thinkpad</name>
|
||||||
|
<_description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
</variantList>
|
</variantList>
|
||||||
</layout>
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
@ -3110,6 +3116,12 @@
|
|||||||
<_description>French (Macintosh)</_description>
|
<_description>French (Macintosh)</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>azerty</name>
|
||||||
|
<_description>French (Azerty)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
<variant>
|
<variant>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>bre</name>
|
<name>bre</name>
|
||||||
@ -5672,6 +5684,16 @@
|
|||||||
</languageList>
|
</languageList>
|
||||||
</configItem>
|
</configItem>
|
||||||
</layout>
|
</layout>
|
||||||
|
<layout>
|
||||||
|
<configItem>
|
||||||
|
<name>tg</name>
|
||||||
|
<_shortDescription>fr-tg</_shortDescription>
|
||||||
|
<_description>French (Togo)</_description>
|
||||||
|
<languageList>
|
||||||
|
<iso639Id>fra</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>ke</name>
|
<name>ke</name>
|
||||||
@ -6487,6 +6509,12 @@
|
|||||||
<_description>Make Caps Lock an additional Hyper</_description>
|
<_description>Make Caps Lock an additional Hyper</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<configItem>
|
||||||
|
<name>caps:menu</name>
|
||||||
|
<_description>Make Caps Lock an additional Menu key</_description>
|
||||||
|
</configItem>
|
||||||
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>caps:shiftlock</name>
|
<name>caps:shiftlock</name>
|
||||||
@ -6578,6 +6606,12 @@
|
|||||||
<_description>Alt is swapped with Win</_description>
|
<_description>Alt is swapped with Win</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<configItem>
|
||||||
|
<name>altwin:prtsc_rwin</name>
|
||||||
|
<_description>Win is mapped to PrtSc (and the usual Win key)</_description>
|
||||||
|
</configItem>
|
||||||
|
</option>
|
||||||
</group>
|
</group>
|
||||||
<group allowMultipleSelection="true">
|
<group allowMultipleSelection="true">
|
||||||
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
|
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
|
de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
jp $sun_compat = complete+japan(kana_lock)
|
jp $sun_compat = complete+japan(kana_lock)
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
|
de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
|
||||||
de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
|
de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
|
||||||
|
de koy = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2
|
||||||
jp $sun_compat = +complete+japan(kana_lock):2
|
jp $sun_compat = +complete+japan(kana_lock):2
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
|
de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
|
||||||
de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
|
de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
|
||||||
|
de koy = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3
|
||||||
jp $sun_compat = +complete+japan(kana_lock):3
|
jp $sun_compat = +complete+japan(kana_lock):3
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
|
de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
|
||||||
de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
|
de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
|
||||||
|
de koy = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4
|
||||||
jp $sun_compat = +complete+japan(kana_lock):4
|
jp $sun_compat = +complete+japan(kana_lock):4
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
|
de koy = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock)
|
||||||
jp $sun_compat = complete+japan(kana_lock)
|
jp $sun_compat = complete+japan(kana_lock)
|
||||||
|
|||||||
@ -140,6 +140,12 @@
|
|||||||
<_description>German (Aus der Neo-Welt)</_description>
|
<_description>German (Aus der Neo-Welt)</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>koy</name>
|
||||||
|
<_description>German (KOY)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
</variantList>
|
</variantList>
|
||||||
</layout>
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
|
|||||||
1
dist/xkeyboard-config/rules/evdev.m_k.part
vendored
1
dist/xkeyboard-config/rules/evdev.m_k.part
vendored
@ -1,5 +1,6 @@
|
|||||||
pc98 = evdev(pc98)
|
pc98 = evdev(pc98)
|
||||||
applealu_jis = evdev+macintosh(jisevdev)
|
applealu_jis = evdev+macintosh(jisevdev)
|
||||||
|
$jollamodels = evdev+jolla(jolla)
|
||||||
olpc = evdev+olpc(olpc)
|
olpc = evdev+olpc(olpc)
|
||||||
olpcm = evdev+olpc(olpcm)
|
olpcm = evdev+olpc(olpcm)
|
||||||
* = evdev
|
* = evdev
|
||||||
|
|||||||
34
dist/xkeyboard-config/rules/evdev.xml.in
vendored
34
dist/xkeyboard-config/rules/evdev.xml.in
vendored
@ -2272,6 +2272,12 @@
|
|||||||
</languageList>
|
</languageList>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>thinkpad</name>
|
||||||
|
<_description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
</variantList>
|
</variantList>
|
||||||
</layout>
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
@ -3110,6 +3116,12 @@
|
|||||||
<_description>French (Macintosh)</_description>
|
<_description>French (Macintosh)</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</variant>
|
</variant>
|
||||||
|
<variant>
|
||||||
|
<configItem>
|
||||||
|
<name>azerty</name>
|
||||||
|
<_description>French (Azerty)</_description>
|
||||||
|
</configItem>
|
||||||
|
</variant>
|
||||||
<variant>
|
<variant>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>bre</name>
|
<name>bre</name>
|
||||||
@ -5672,6 +5684,16 @@
|
|||||||
</languageList>
|
</languageList>
|
||||||
</configItem>
|
</configItem>
|
||||||
</layout>
|
</layout>
|
||||||
|
<layout>
|
||||||
|
<configItem>
|
||||||
|
<name>tg</name>
|
||||||
|
<_shortDescription>fr-tg</_shortDescription>
|
||||||
|
<_description>French (Togo)</_description>
|
||||||
|
<languageList>
|
||||||
|
<iso639Id>fra</iso639Id>
|
||||||
|
</languageList>
|
||||||
|
</configItem>
|
||||||
|
</layout>
|
||||||
<layout>
|
<layout>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>ke</name>
|
<name>ke</name>
|
||||||
@ -6487,6 +6509,12 @@
|
|||||||
<_description>Make Caps Lock an additional Hyper</_description>
|
<_description>Make Caps Lock an additional Hyper</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<configItem>
|
||||||
|
<name>caps:menu</name>
|
||||||
|
<_description>Make Caps Lock an additional Menu key</_description>
|
||||||
|
</configItem>
|
||||||
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<configItem>
|
<configItem>
|
||||||
<name>caps:shiftlock</name>
|
<name>caps:shiftlock</name>
|
||||||
@ -6578,6 +6606,12 @@
|
|||||||
<_description>Alt is swapped with Win</_description>
|
<_description>Alt is swapped with Win</_description>
|
||||||
</configItem>
|
</configItem>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<configItem>
|
||||||
|
<name>altwin:prtsc_rwin</name>
|
||||||
|
<_description>Win is mapped to PrtSc (and the usual Win key)</_description>
|
||||||
|
</configItem>
|
||||||
|
</option>
|
||||||
</group>
|
</group>
|
||||||
<group allowMultipleSelection="true">
|
<group allowMultipleSelection="true">
|
||||||
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
|
<!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
|
||||||
|
|||||||
4
dist/xkeyboard-config/symbols/Makefile.am
vendored
4
dist/xkeyboard-config/symbols/Makefile.am
vendored
@ -1,4 +1,4 @@
|
|||||||
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
|
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
|
||||||
|
|
||||||
symbolsdir = $(xkb_base)/symbols
|
symbolsdir = $(xkb_base)/symbols
|
||||||
symbols_DATA = \
|
symbols_DATA = \
|
||||||
@ -29,7 +29,7 @@ pc ph pk pl pt \
|
|||||||
ro rs ru \
|
ro rs ru \
|
||||||
se si sk sn \
|
se si sk sn \
|
||||||
sy th \
|
sy th \
|
||||||
terminate \
|
terminate tg \
|
||||||
tj tm tr tw tz \
|
tj tm tr tw tz \
|
||||||
ua us uz vn \
|
ua us uz vn \
|
||||||
za \
|
za \
|
||||||
|
|||||||
4
dist/xkeyboard-config/symbols/Makefile.in
vendored
4
dist/xkeyboard-config/symbols/Makefile.in
vendored
@ -361,7 +361,7 @@ top_builddir = @top_builddir@
|
|||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
xkb_base = @xkb_base@
|
xkb_base = @xkb_base@
|
||||||
xkb_rules_symlink = @xkb_rules_symlink@
|
xkb_rules_symlink = @xkb_rules_symlink@
|
||||||
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
|
SUBDIRS = digital_vndr fujitsu_vndr hp_vndr jolla_vndr macintosh_vndr nec_vndr nokia_vndr sharp_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
|
||||||
symbolsdir = $(xkb_base)/symbols
|
symbolsdir = $(xkb_base)/symbols
|
||||||
symbols_DATA = \
|
symbols_DATA = \
|
||||||
af al \
|
af al \
|
||||||
@ -391,7 +391,7 @@ pc ph pk pl pt \
|
|||||||
ro rs ru \
|
ro rs ru \
|
||||||
se si sk sn \
|
se si sk sn \
|
||||||
sy th \
|
sy th \
|
||||||
terminate \
|
terminate tg \
|
||||||
tj tm tr tw tz \
|
tj tm tr tw tz \
|
||||||
ua us uz vn \
|
ua us uz vn \
|
||||||
za \
|
za \
|
||||||
|
|||||||
7
dist/xkeyboard-config/symbols/altwin
vendored
7
dist/xkeyboard-config/symbols/altwin
vendored
@ -107,3 +107,10 @@ xkb_symbols "swap_ralt_rwin" {
|
|||||||
symbols[Group1] = [ Super_R ] };
|
symbols[Group1] = [ Super_R ] };
|
||||||
key <RWIN> { [ Alt_R, Meta_R ] };
|
key <RWIN> { [ Alt_R, Meta_R ] };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Win is mapped to the PrtSc key (and the usual Win key).
|
||||||
|
partial modifier_keys
|
||||||
|
xkb_symbols "prtsc_rwin" {
|
||||||
|
replace key <PRSC> { [ Super_R, Super_R ] };
|
||||||
|
modifier_map Mod4 { <PRSC>, <RWIN> };
|
||||||
|
};
|
||||||
|
|||||||
27
dist/xkeyboard-config/symbols/az
vendored
27
dist/xkeyboard-config/symbols/az
vendored
@ -1,5 +1,7 @@
|
|||||||
// Symbols definition for a very simple Azerbaidjani keyboard layout.
|
// Symbols definition for a Azerbaijani keyboard layout.
|
||||||
|
// Based on AZS 495-2010 standard.
|
||||||
// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
|
// 2001 - Pablo Saratxaga <pablo@mandrakesoft.com>
|
||||||
|
// 2015 - Adil Aliyev <adilaliev@gmail.com>
|
||||||
|
|
||||||
default partial alphanumeric_keys
|
default partial alphanumeric_keys
|
||||||
xkb_symbols "latin" {
|
xkb_symbols "latin" {
|
||||||
@ -8,26 +10,23 @@ xkb_symbols "latin" {
|
|||||||
|
|
||||||
name[Group1]= "Azerbaijani";
|
name[Group1]= "Azerbaijani";
|
||||||
|
|
||||||
key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] };
|
key <TLDE> { [ grave, asciitilde ] };
|
||||||
|
key <AE02> { [ 2, quotedbl ] };
|
||||||
key <AE03> { [ 3, numbersign, U2166 ] };
|
key <AE03> { [ 3, U2166 ] };
|
||||||
key <AE06> { [ 6, colon, EuroSign, periodcentered ] };
|
key <AE04> { [ 4, semicolon ] };
|
||||||
|
key <AE05> { [ 5, percent ] };
|
||||||
|
key <AE06> { [ 6, colon ] };
|
||||||
key <AE07> { [ 7, question ] };
|
key <AE07> { [ 7, question ] };
|
||||||
|
key <AE08> { [ 8, asterisk ] };
|
||||||
|
|
||||||
key <AE08> { [ 8, asterisk, asciicircum, dead_circumflex ] };
|
key <BKSL> { [ backslash, slash ] };
|
||||||
key <AE11> { [ minus, underscore, hyphen, emdash ] };
|
|
||||||
|
|
||||||
key <AD02> { [ udiaeresis, Udiaeresis ] };
|
key <AD02> { [ udiaeresis, Udiaeresis ] };
|
||||||
key <AD04> { [ r, R, registered ] };
|
|
||||||
key <AD08> { [ i, Iabovedot ] };
|
key <AD08> { [ i, Iabovedot ] };
|
||||||
key <AD11> { [ odiaeresis, Odiaeresis, bracketleft, braceleft ] };
|
key <AD11> { [ odiaeresis, Odiaeresis ] };
|
||||||
key <AD12> { [ gbreve, Gbreve, bracketright, braceright ] };
|
key <AD12> { [ gbreve, Gbreve ] };
|
||||||
|
|
||||||
key <AC10> { [ idotless, I ] };
|
key <AC10> { [ idotless, I ] };
|
||||||
key <AC11> { [ schwa, SCHWA ] };
|
key <AC11> { [ schwa, SCHWA ] };
|
||||||
|
|
||||||
key <AB03> { [ c, C, copyright, division ] };
|
|
||||||
key <AB07> { [ m, M, periodcentered, currency ] };
|
|
||||||
key <AB08> { [ ccedilla, Ccedilla ] };
|
key <AB08> { [ ccedilla, Ccedilla ] };
|
||||||
key <AB09> { [ scedilla, Scedilla ] };
|
key <AB09> { [ scedilla, Scedilla ] };
|
||||||
key <AB10> { [ period, comma ] };
|
key <AB10> { [ period, comma ] };
|
||||||
|
|||||||
1
dist/xkeyboard-config/symbols/br
vendored
1
dist/xkeyboard-config/symbols/br
vendored
@ -64,6 +64,7 @@ partial alphanumeric_keys
|
|||||||
xkb_symbols "thinkpad" {
|
xkb_symbols "thinkpad" {
|
||||||
|
|
||||||
include "br(abnt2)"
|
include "br(abnt2)"
|
||||||
|
name[Group1]="Portuguese (Brazil, IBM/Lenovo ThinkPad)";
|
||||||
|
|
||||||
key <RCTL> { [ slash, question, degree, questiondown ] };
|
key <RCTL> { [ slash, question, degree, questiondown ] };
|
||||||
};
|
};
|
||||||
|
|||||||
5
dist/xkeyboard-config/symbols/capslock
vendored
5
dist/xkeyboard-config/symbols/capslock
vendored
@ -51,6 +51,11 @@ xkb_symbols "hyper" {
|
|||||||
modifier_map Mod4 { <CAPS> };
|
modifier_map Mod4 { <CAPS> };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hidden partial modifier_keys
|
||||||
|
xkb_symbols "menu" {
|
||||||
|
key <CAPS> { [ Menu ] };
|
||||||
|
};
|
||||||
|
|
||||||
hidden partial modifier_keys
|
hidden partial modifier_keys
|
||||||
xkb_symbols "none" {
|
xkb_symbols "none" {
|
||||||
key <CAPS> { [ VoidSymbol ] };
|
key <CAPS> { [ VoidSymbol ] };
|
||||||
|
|||||||
80
dist/xkeyboard-config/symbols/de
vendored
80
dist/xkeyboard-config/symbols/de
vendored
@ -338,7 +338,7 @@ xkb_symbols "neo_base" {
|
|||||||
|
|
||||||
// Alphanumeric-keys
|
// Alphanumeric-keys
|
||||||
// ===============
|
// ===============
|
||||||
key.type[Group1] = "EIGHT_LEVEL";
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
|
|
||||||
// Tab as Multi_key (Compose)
|
// Tab as Multi_key (Compose)
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
@ -366,7 +366,7 @@ xkb_symbols "neo_base" {
|
|||||||
|
|
||||||
// Top row
|
// Top row
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
|
key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
|
||||||
key <AD01> { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] };
|
key <AD01> { [ x, X, ellipsis, Greek_xi, Prior, Prior, Greek_XI, NoSymbol ] };
|
||||||
key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] };
|
key <AD02> { [ v, V, underscore, NoSymbol, BackSpace, BackSpace, radical, NoSymbol ] };
|
||||||
key <AD03> { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] };
|
key <AD03> { [ l, L, bracketleft, Greek_lambda, Up, Up, Greek_LAMBDA, NoSymbol ] };
|
||||||
@ -381,12 +381,12 @@ xkb_symbols "neo_base" {
|
|||||||
|
|
||||||
key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] };
|
key <AD11> { [ ssharp, U1E9E, U017F, Greek_finalsmallsigma, U2212, NoSymbol, jot, NoSymbol ] };
|
||||||
|
|
||||||
key.type[Group1] = "EIGHT_LEVEL";
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
key <AD12> { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] };
|
key <AD12> { [ dead_acute, dead_tilde, dead_stroke, dead_psili, dead_doubleacute, NoSymbol, dead_breve, NoSymbol ] };
|
||||||
|
|
||||||
// Middle row
|
// Middle row
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
|
key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
|
||||||
key <AC01> { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] };
|
key <AC01> { [ u, U, backslash, NoSymbol, Home, Home, includedin, NoSymbol ] };
|
||||||
key <AC02> { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] };
|
key <AC02> { [ i, I, slash, Greek_iota, Left, Left, integral, NoSymbol ] };
|
||||||
key <AC03> { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] };
|
key <AC03> { [ a, A, braceleft, Greek_alpha, Down, Down, U2200, NoSymbol ] };
|
||||||
@ -411,12 +411,12 @@ xkb_symbols "neo_base" {
|
|||||||
|
|
||||||
key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] };
|
key <AB06> { [ b, B, plus, Greek_beta, colon, NoSymbol, U21D0, NoSymbol ] };
|
||||||
key <AB07> { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] };
|
key <AB07> { [ m, M, percent, Greek_mu, KP_1, KP_1, ifonlyif, NoSymbol ] };
|
||||||
key.type[Group1] = "EIGHT_LEVEL";
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
key <AB08> { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] };
|
key <AB08> { [ comma, endash, quotedbl, U03F1, KP_2, KP_2, U21D2, NoSymbol ] };
|
||||||
key <AB09> { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] };
|
key <AB09> { [ period, enfilledcircbullet, apostrophe, U03D1, KP_3, KP_3, U21A6, NoSymbol ] };
|
||||||
key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
|
key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
|
||||||
key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] };
|
key <AB10> { [ j, J, semicolon, Greek_theta, semicolon, NoSymbol, Greek_THETA, NoSymbol ] };
|
||||||
key.type[Group1] = "EIGHT_LEVEL";
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
|
|
||||||
// Space key
|
// Space key
|
||||||
// --------------------------------------------------------------
|
// --------------------------------------------------------------
|
||||||
@ -472,8 +472,8 @@ xkb_symbols "neo" {
|
|||||||
include "shift(both_capslock)"
|
include "shift(both_capslock)"
|
||||||
include "level3(caps_switch)"
|
include "level3(caps_switch)"
|
||||||
include "level3(bksl_switch)"
|
include "level3(bksl_switch)"
|
||||||
include "level5(lsgt_switch)"
|
include "level5(lsgt_switch_lock)"
|
||||||
include "level5(ralt_switch)"
|
include "level5(ralt_switch_lock)"
|
||||||
};
|
};
|
||||||
|
|
||||||
// Copied from macintosh_vndr/de
|
// Copied from macintosh_vndr/de
|
||||||
@ -787,11 +787,11 @@ partial alphanumeric_keys
|
|||||||
xkb_symbols "adnw_base" {
|
xkb_symbols "adnw_base" {
|
||||||
include "de(neo_base)"
|
include "de(neo_base)"
|
||||||
|
|
||||||
key.type[Group1] = "EIGHT_LEVEL";
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
key <AD04> { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] };
|
key <AD04> { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] };
|
||||||
key <AB04> { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] };
|
key <AB04> { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] };
|
||||||
|
|
||||||
key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC";
|
key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
|
||||||
key <AD01> { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] };
|
key <AD01> { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] };
|
||||||
key <AD02> { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] };
|
key <AD02> { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] };
|
||||||
key <AD03> { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] };
|
key <AD03> { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] };
|
||||||
@ -834,7 +834,61 @@ xkb_symbols "adnw" {
|
|||||||
include "shift(both_capslock)"
|
include "shift(both_capslock)"
|
||||||
include "level3(caps_switch)"
|
include "level3(caps_switch)"
|
||||||
include "level3(bksl_switch)"
|
include "level3(bksl_switch)"
|
||||||
include "level5(lsgt_switch)"
|
include "level5(lsgt_switch_lock)"
|
||||||
include "level5(ralt_switch)"
|
include "level5(ralt_switch_lock)"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
partial alphanumeric_keys
|
||||||
|
xkb_symbols "koy_base" {
|
||||||
|
include "de(neo_base)"
|
||||||
|
|
||||||
|
key.type[Group1] = "EIGHT_LEVEL_LEVEL_FIVE_LOCK";
|
||||||
|
key <AD02> { [ period, enfilledcircbullet, NoSymbol, U03D1, NoSymbol, NoSymbol, U21A6, NoSymbol ] };
|
||||||
|
key <AD04> { [ comma, endash, NoSymbol, U03F1, NoSymbol, NoSymbol, U21D2, NoSymbol ] };
|
||||||
|
|
||||||
|
key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK";
|
||||||
|
key <AD01> { [ k, K, NoSymbol, Greek_kappa, NoSymbol, NoSymbol, multiply, NoSymbol ] };
|
||||||
|
key <AD03> { [ o, O, NoSymbol, Greek_omicron, NoSymbol, NoSymbol, elementof, NoSymbol ] };
|
||||||
|
key <AD05> { [ y, Y, NoSymbol, Greek_upsilon, NoSymbol, NoSymbol, nabla, NoSymbol ] };
|
||||||
|
key <AD06> { [ v, V, NoSymbol, NoSymbol, NoSymbol, NoSymbol, radical, NoSymbol ] };
|
||||||
|
key <AD07> { [ g, G, NoSymbol, Greek_gamma, NoSymbol, NoSymbol, Greek_GAMMA, NoSymbol ] };
|
||||||
|
key <AD08> { [ c, C, NoSymbol, Greek_chi, NoSymbol, NoSymbol, U2102, NoSymbol ] };
|
||||||
|
key <AD09> { [ l, L, NoSymbol, Greek_lambda, NoSymbol, NoSymbol, Greek_LAMBDA, NoSymbol ] };
|
||||||
|
key <AD10> { [ ssharp, U1E9E, NoSymbol, Greek_finalsmallsigma, NoSymbol, NoSymbol, jot, NoSymbol ] };
|
||||||
|
key <AD11> { [ z, Z, NoSymbol, Greek_zeta, NoSymbol, NoSymbol, U2124, NoSymbol ] };
|
||||||
|
key <AC01> { [ h, H, NoSymbol, Greek_psi, NoSymbol, NoSymbol, Greek_PSI, NoSymbol ] };
|
||||||
|
key <AC02> { [ a, A, NoSymbol, Greek_alpha, NoSymbol, NoSymbol, U2200, NoSymbol ] };
|
||||||
|
key <AC03> { [ e, E, NoSymbol, Greek_epsilon, NoSymbol, NoSymbol, U2203, NoSymbol ] };
|
||||||
|
key <AC04> { [ i, I, NoSymbol, Greek_iota, NoSymbol, NoSymbol, integral, NoSymbol ] };
|
||||||
|
key <AC05> { [ u, U, NoSymbol, NoSymbol, NoSymbol, NoSymbol, includedin, NoSymbol ] };
|
||||||
|
key <AC06> { [ d, D, NoSymbol, Greek_delta, NoSymbol, NoSymbol, Greek_DELTA, NoSymbol ] };
|
||||||
|
key <AC07> { [ t, T, NoSymbol, Greek_tau, NoSymbol, NoSymbol, partialderivative, NoSymbol ] };
|
||||||
|
key <AC08> { [ r, R, NoSymbol, Greek_rho, NoSymbol, NoSymbol, U211D, NoSymbol ] };
|
||||||
|
key <AC09> { [ n, N, NoSymbol, Greek_nu, NoSymbol, NoSymbol, U2115, NoSymbol ] };
|
||||||
|
key <AC10> { [ s, S, NoSymbol, Greek_sigma, NoSymbol, NoSymbol, Greek_SIGMA, NoSymbol ] };
|
||||||
|
key <AC11> { [ f, F, NoSymbol, Greek_phi, NoSymbol, NoSymbol, Greek_PHI, NoSymbol ] };
|
||||||
|
key <AB01> { [ x, X, NoSymbol, Greek_xi, NoSymbol, NoSymbol, Greek_XI, NoSymbol ] };
|
||||||
|
key <AB02> { [ q, Q, NoSymbol, U03D5, NoSymbol, NoSymbol, U211A, NoSymbol ] };
|
||||||
|
key <AB03> { [ adiaeresis, Adiaeresis, NoSymbol, Greek_eta, NoSymbol, NoSymbol, U2135, NoSymbol ] };
|
||||||
|
key <AB04> { [ udiaeresis, Udiaeresis, NoSymbol, NoSymbol, NoSymbol, NoSymbol, union, NoSymbol ] };
|
||||||
|
key <AB05> { [ odiaeresis, Odiaeresis, NoSymbol, U03F5, NoSymbol, NoSymbol, intersection, NoSymbol ] };
|
||||||
|
key <AB06> { [ b, B, NoSymbol, Greek_beta, NoSymbol, NoSymbol, U21D0, NoSymbol ] };
|
||||||
|
key <AB07> { [ p, P, NoSymbol, Greek_pi, NoSymbol, NoSymbol, Greek_PI, NoSymbol ] };
|
||||||
|
key <AB08> { [ w, W, NoSymbol, Greek_omega, NoSymbol, NoSymbol, Greek_OMEGA, NoSymbol ] };
|
||||||
|
key <AB09> { [ m, M, NoSymbol, Greek_mu, NoSymbol, NoSymbol, ifonlyif, NoSymbol ] };
|
||||||
|
key <AB10> { [ j, J, NoSymbol, Greek_theta, NoSymbol, NoSymbol, Greek_THETA, NoSymbol ] };
|
||||||
|
};
|
||||||
|
|
||||||
|
partial alphanumeric_keys modifier_keys keypad_keys
|
||||||
|
xkb_symbols "koy" {
|
||||||
|
|
||||||
|
include "de(koy_base)"
|
||||||
|
|
||||||
|
name[Group1]= "German (KOY)";
|
||||||
|
|
||||||
|
include "shift(both_capslock)"
|
||||||
|
include "level3(caps_switch)"
|
||||||
|
include "level3(bksl_switch)"
|
||||||
|
include "level5(lsgt_switch_lock)"
|
||||||
|
include "level5(ralt_switch_lock)"
|
||||||
|
};
|
||||||
|
|||||||
86
dist/xkeyboard-config/symbols/fr
vendored
86
dist/xkeyboard-config/symbols/fr
vendored
@ -985,3 +985,89 @@ partial alphanumeric_keys
|
|||||||
xkb_symbols "sun_type6" {
|
xkb_symbols "sun_type6" {
|
||||||
include "sun_vndr/fr(sun_type6)"
|
include "sun_vndr/fr(sun_type6)"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
partial alphanumeric_keys
|
||||||
|
xkb_symbols "azerty" {
|
||||||
|
name[Group1]="French (Azerty)";
|
||||||
|
|
||||||
|
include "level3(ralt_switch)"
|
||||||
|
|
||||||
|
// French AZERTY-Keyboard layout
|
||||||
|
// Author : 2015, Mats Blakstad <mats @ globalbility.org>
|
||||||
|
// Based on the layout at https://en.wikipedia.org/wiki/File:KB_France.svg
|
||||||
|
|
||||||
|
// LAYOUT OVERVIEW
|
||||||
|
// ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
|
||||||
|
// | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ° | + | <-- |
|
||||||
|
// | ² | & | é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }| |
|
||||||
|
// ========================================================================
|
||||||
|
// | |<- | A | Z | E | R | T | Y | U | I | O | P | ¨ | $ | , |
|
||||||
|
// | ->| | a | z | e €| r | t | y | u | i | o | p | ^ | £ ¤| <-' |
|
||||||
|
// ===================================================================¬ |
|
||||||
|
// | | Q | S | D | F | G | H | J | K | L | M | % | µ | |
|
||||||
|
// | MAJ | q | s | d | f | g | h | j | k | l | m | ù | * | |
|
||||||
|
// ========================================================================
|
||||||
|
// | ^ | > | W | X | C | V | B | N | ? | . | / | § | ^ |
|
||||||
|
// | | | < | w | x | c | v | b | n | , | ; | : | ! | | |
|
||||||
|
// ========================================================================
|
||||||
|
// | | | | | | | | |
|
||||||
|
// | Ctrl | Super| Alt | Space Nobreakspace | AltGr | Super|Menu | Ctrl |
|
||||||
|
// ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
|
||||||
|
|
||||||
|
// First row
|
||||||
|
key <TLDE> { [ twosuperior ] };
|
||||||
|
key <AE01> { [ ampersand, 1 ] };
|
||||||
|
key <AE02> { [ eacute, 2, asciitilde ] };
|
||||||
|
key <AE03> { [ quotedbl, 3, numbersign ] };
|
||||||
|
key <AE04> { [ apostrophe, 4, braceleft ] };
|
||||||
|
key <AE05> { [ parenleft, 5, bracketleft ] };
|
||||||
|
key <AE06> { [ minus, 6, bar ] };
|
||||||
|
key <AE07> { [ egrave, 7, grave ] };
|
||||||
|
key <AE08> { [ underscore, 8, backslash ] };
|
||||||
|
key <AE09> { [ ccedilla, 9, asciicircum ] };
|
||||||
|
key <AE10> { [ agrave, 0, at ] };
|
||||||
|
key <AE11> { [ parenright, degree, bracketright ] };
|
||||||
|
key <AE12> { [ equal, plus, braceright ] };
|
||||||
|
|
||||||
|
// Second row
|
||||||
|
key <AD01> { [ a, A ] };
|
||||||
|
key <AD02> { [ z, Z ] };
|
||||||
|
key <AD03> { [ e, E, EuroSign ] };
|
||||||
|
key <AD04> { [ r, R ] };
|
||||||
|
key <AD05> { [ t, T ] };
|
||||||
|
key <AD06> { [ y, Y ] };
|
||||||
|
key <AD07> { [ u, U ] };
|
||||||
|
key <AD08> { [ i, I ] };
|
||||||
|
key <AD09> { [ o, O ] };
|
||||||
|
key <AD10> { [ p, P ] };
|
||||||
|
key <AD11> { [ dead_circumflex,dead_diaeresis ] };
|
||||||
|
key <AD12> { [ dollar, sterling, currency ] };
|
||||||
|
|
||||||
|
// Third row
|
||||||
|
key <AC01> { [ q, Q ] };
|
||||||
|
key <AC02> { [ s, S ] };
|
||||||
|
key <AC03> { [ d, D ] };
|
||||||
|
key <AC04> { [ f, F ] };
|
||||||
|
key <AC05> { [ g, G ] };
|
||||||
|
key <AC06> { [ h, H ] };
|
||||||
|
key <AC07> { [ j, J ] };
|
||||||
|
key <AC08> { [ k, K ] };
|
||||||
|
key <AC09> { [ l, L ] };
|
||||||
|
key <AC10> { [ m, M ] };
|
||||||
|
key <AC11> { [ ugrave, percent ] };
|
||||||
|
key <BKSL> { [ asterisk, mu ] };
|
||||||
|
|
||||||
|
// Fourth row
|
||||||
|
key <LSGT> { [ less, greater ] };
|
||||||
|
key <AB01> { [ w, W ] };
|
||||||
|
key <AB02> { [ x, X ] };
|
||||||
|
key <AB03> { [ c, C ] };
|
||||||
|
key <AB04> { [ v, V ] };
|
||||||
|
key <AB05> { [ b, B ] };
|
||||||
|
key <AB06> { [ n, N ] };
|
||||||
|
key <AB07> { [ comma, question ] };
|
||||||
|
key <AB08> { [ semicolon, period ] };
|
||||||
|
key <AB09> { [ colon, slash ] };
|
||||||
|
key <AB10> { [ exclam, section ] };
|
||||||
|
};
|
||||||
|
|||||||
4
dist/xkeyboard-config/symbols/group
vendored
4
dist/xkeyboard-config/symbols/group
vendored
@ -322,12 +322,12 @@ partial modifier_keys
|
|||||||
xkb_symbols "ctrls_toggle" {
|
xkb_symbols "ctrls_toggle" {
|
||||||
virtual_modifiers LControl, RControl;
|
virtual_modifiers LControl, RControl;
|
||||||
key <LCTL> {
|
key <LCTL> {
|
||||||
type[Group1]="PC_RCONTROL_LEVEL2",
|
type[Group1]="PC_CONTROL_LEVEL2",
|
||||||
symbols[Group1] = [ NoSymbol, ISO_Prev_Group ],
|
symbols[Group1] = [ NoSymbol, ISO_Prev_Group ],
|
||||||
virtualMods= LControl
|
virtualMods= LControl
|
||||||
};
|
};
|
||||||
key <RCTL> {
|
key <RCTL> {
|
||||||
type[Group1]="PC_LCONTROL_LEVEL2",
|
type[Group1]="PC_CONTROL_LEVEL2",
|
||||||
symbols[Group1] = [ NoSymbol, ISO_Next_Group ],
|
symbols[Group1] = [ NoSymbol, ISO_Next_Group ],
|
||||||
virtualMods= RControl
|
virtualMods= RControl
|
||||||
};
|
};
|
||||||
|
|||||||
1
dist/xkeyboard-config/symbols/is
vendored
1
dist/xkeyboard-config/symbols/is
vendored
@ -23,6 +23,7 @@ xkb_symbols "basic" {
|
|||||||
key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] };
|
key <AD11> { [ eth, ETH, dead_diaeresis, dead_abovering ] };
|
||||||
key <AD12> { [apostrophe, question, asciitilde, dead_macron ] };
|
key <AD12> { [apostrophe, question, asciitilde, dead_macron ] };
|
||||||
|
|
||||||
|
key <AC03> { [ d, D, U201e, U201c ] };
|
||||||
key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] };
|
key <AC10> { [ ae, AE, asciicircum, dead_doubleacute ] };
|
||||||
key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
|
key <AC11> { [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
|
||||||
key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] };
|
key <TLDE> { [dead_abovering, dead_diaeresis, notsign, hyphen ] };
|
||||||
|
|||||||
4
dist/xkeyboard-config/symbols/jolla_vndr/Makefile.am
vendored
Normal file
4
dist/xkeyboard-config/symbols/jolla_vndr/Makefile.am
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
symbolsdir = $(xkb_base)/symbols/jolla_vndr
|
||||||
|
|
||||||
|
dist_symbols_DATA = \
|
||||||
|
sbj
|
||||||
521
dist/xkeyboard-config/symbols/jolla_vndr/Makefile.in
vendored
Normal file
521
dist/xkeyboard-config/symbols/jolla_vndr/Makefile.in
vendored
Normal file
@ -0,0 +1,521 @@
|
|||||||
|
# Makefile.in generated by automake 1.15 from Makefile.am.
|
||||||
|
# @configure_input@
|
||||||
|
|
||||||
|
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
# This Makefile.in is free software; the Free Software Foundation
|
||||||
|
# gives unlimited permission to copy and/or distribute it,
|
||||||
|
# with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
||||||
|
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
||||||
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
@SET_MAKE@
|
||||||
|
|
||||||
|
VPATH = @srcdir@
|
||||||
|
am__is_gnu_make = { \
|
||||||
|
if test -z '$(MAKELEVEL)'; then \
|
||||||
|
false; \
|
||||||
|
elif test -n '$(MAKE_HOST)'; then \
|
||||||
|
true; \
|
||||||
|
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
|
||||||
|
true; \
|
||||||
|
else \
|
||||||
|
false; \
|
||||||
|
fi; \
|
||||||
|
}
|
||||||
|
am__make_running_with_option = \
|
||||||
|
case $${target_option-} in \
|
||||||
|
?) ;; \
|
||||||
|
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||||
|
"target option '$${target_option-}' specified" >&2; \
|
||||||
|
exit 1;; \
|
||||||
|
esac; \
|
||||||
|
has_opt=no; \
|
||||||
|
sane_makeflags=$$MAKEFLAGS; \
|
||||||
|
if $(am__is_gnu_make); then \
|
||||||
|
sane_makeflags=$$MFLAGS; \
|
||||||
|
else \
|
||||||
|
case $$MAKEFLAGS in \
|
||||||
|
*\\[\ \ ]*) \
|
||||||
|
bs=\\; \
|
||||||
|
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||||
|
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||||
|
esac; \
|
||||||
|
fi; \
|
||||||
|
skip_next=no; \
|
||||||
|
strip_trailopt () \
|
||||||
|
{ \
|
||||||
|
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||||
|
}; \
|
||||||
|
for flg in $$sane_makeflags; do \
|
||||||
|
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||||
|
case $$flg in \
|
||||||
|
*=*|--*) continue;; \
|
||||||
|
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||||
|
-*I?*) strip_trailopt 'I';; \
|
||||||
|
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||||
|
-*O?*) strip_trailopt 'O';; \
|
||||||
|
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||||
|
-*l?*) strip_trailopt 'l';; \
|
||||||
|
-[dEDm]) skip_next=yes;; \
|
||||||
|
-[JT]) skip_next=yes;; \
|
||||||
|
esac; \
|
||||||
|
case $$flg in \
|
||||||
|
*$$target_option*) has_opt=yes; break;; \
|
||||||
|
esac; \
|
||||||
|
done; \
|
||||||
|
test $$has_opt = yes
|
||||||
|
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||||
|
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||||
|
pkgdatadir = $(datadir)/@PACKAGE@
|
||||||
|
pkgincludedir = $(includedir)/@PACKAGE@
|
||||||
|
pkglibdir = $(libdir)/@PACKAGE@
|
||||||
|
pkglibexecdir = $(libexecdir)/@PACKAGE@
|
||||||
|
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
|
||||||
|
install_sh_DATA = $(install_sh) -c -m 644
|
||||||
|
install_sh_PROGRAM = $(install_sh) -c
|
||||||
|
install_sh_SCRIPT = $(install_sh) -c
|
||||||
|
INSTALL_HEADER = $(INSTALL_DATA)
|
||||||
|
transform = $(program_transform_name)
|
||||||
|
NORMAL_INSTALL = :
|
||||||
|
PRE_INSTALL = :
|
||||||
|
POST_INSTALL = :
|
||||||
|
NORMAL_UNINSTALL = :
|
||||||
|
PRE_UNINSTALL = :
|
||||||
|
POST_UNINSTALL = :
|
||||||
|
build_triplet = @build@
|
||||||
|
host_triplet = @host@
|
||||||
|
subdir = symbols/jolla_vndr
|
||||||
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
|
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
|
||||||
|
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
|
||||||
|
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
|
||||||
|
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \
|
||||||
|
$(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
|
||||||
|
$(top_srcdir)/configure.ac
|
||||||
|
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
|
$(ACLOCAL_M4)
|
||||||
|
DIST_COMMON = $(srcdir)/Makefile.am $(dist_symbols_DATA) \
|
||||||
|
$(am__DIST_COMMON)
|
||||||
|
mkinstalldirs = $(install_sh) -d
|
||||||
|
CONFIG_CLEAN_FILES =
|
||||||
|
CONFIG_CLEAN_VPATH_FILES =
|
||||||
|
AM_V_P = $(am__v_P_@AM_V@)
|
||||||
|
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||||
|
am__v_P_0 = false
|
||||||
|
am__v_P_1 = :
|
||||||
|
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||||
|
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||||
|
am__v_GEN_0 = @echo " GEN " $@;
|
||||||
|
am__v_GEN_1 =
|
||||||
|
AM_V_at = $(am__v_at_@AM_V@)
|
||||||
|
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||||
|
am__v_at_0 = @
|
||||||
|
am__v_at_1 =
|
||||||
|
SOURCES =
|
||||||
|
DIST_SOURCES =
|
||||||
|
am__can_run_installinfo = \
|
||||||
|
case $$AM_UPDATE_INFO_DIR in \
|
||||||
|
n|no|NO) false;; \
|
||||||
|
*) (install-info --version) >/dev/null 2>&1;; \
|
||||||
|
esac
|
||||||
|
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'
|
||||||
|
am__uninstall_files_from_dir = { \
|
||||||
|
test -z "$$files" \
|
||||||
|
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
|
||||||
|
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||||||
|
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||||||
|
}
|
||||||
|
am__installdirs = "$(DESTDIR)$(symbolsdir)"
|
||||||
|
DATA = $(dist_symbols_DATA)
|
||||||
|
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||||
|
am__DIST_COMMON = $(srcdir)/Makefile.in
|
||||||
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
ACLOCAL = @ACLOCAL@
|
||||||
|
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||||
|
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||||
|
ALL_LINGUAS = @ALL_LINGUAS@
|
||||||
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
|
AUTOCONF = @AUTOCONF@
|
||||||
|
AUTOHEADER = @AUTOHEADER@
|
||||||
|
AUTOMAKE = @AUTOMAKE@
|
||||||
|
AWK = @AWK@
|
||||||
|
CC = @CC@
|
||||||
|
CCDEPMODE = @CCDEPMODE@
|
||||||
|
CFLAGS = @CFLAGS@
|
||||||
|
CPP = @CPP@
|
||||||
|
CPPFLAGS = @CPPFLAGS@
|
||||||
|
CYGPATH_W = @CYGPATH_W@
|
||||||
|
DEFS = @DEFS@
|
||||||
|
DEPDIR = @DEPDIR@
|
||||||
|
DEPS_CFLAGS = @DEPS_CFLAGS@
|
||||||
|
DEPS_LIBS = @DEPS_LIBS@
|
||||||
|
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||||
|
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||||
|
ECHO_C = @ECHO_C@
|
||||||
|
ECHO_N = @ECHO_N@
|
||||||
|
ECHO_T = @ECHO_T@
|
||||||
|
EGREP = @EGREP@
|
||||||
|
EXEEXT = @EXEEXT@
|
||||||
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
|
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
|
||||||
|
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
|
||||||
|
GMSGFMT = @GMSGFMT@
|
||||||
|
GMSGFMT_015 = @GMSGFMT_015@
|
||||||
|
GREP = @GREP@
|
||||||
|
INSTALL = @INSTALL@
|
||||||
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
|
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||||
|
INTLLIBS = @INTLLIBS@
|
||||||
|
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
|
||||||
|
INTLTOOL_MERGE = @INTLTOOL_MERGE@
|
||||||
|
INTLTOOL_PERL = @INTLTOOL_PERL@
|
||||||
|
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
|
||||||
|
INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
|
||||||
|
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
|
||||||
|
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
|
||||||
|
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
|
||||||
|
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
|
||||||
|
LDFLAGS = @LDFLAGS@
|
||||||
|
LIBICONV = @LIBICONV@
|
||||||
|
LIBINTL = @LIBINTL@
|
||||||
|
LIBOBJS = @LIBOBJS@
|
||||||
|
LIBS = @LIBS@
|
||||||
|
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||||
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
|
LTLIBICONV = @LTLIBICONV@
|
||||||
|
LTLIBINTL = @LTLIBINTL@
|
||||||
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
MAKEINFO = @MAKEINFO@
|
||||||
|
MAN_SUBSTS = @MAN_SUBSTS@
|
||||||
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
|
MKDIR_P = @MKDIR_P@
|
||||||
|
MSGFMT = @MSGFMT@
|
||||||
|
MSGFMT_015 = @MSGFMT_015@
|
||||||
|
MSGMERGE = @MSGMERGE@
|
||||||
|
OBJEXT = @OBJEXT@
|
||||||
|
PACKAGE = @PACKAGE@
|
||||||
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
PACKAGE_NAME = @PACKAGE_NAME@
|
||||||
|
PACKAGE_STRING = @PACKAGE_STRING@
|
||||||
|
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||||
|
PACKAGE_URL = @PACKAGE_URL@
|
||||||
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
|
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
|
||||||
|
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
|
||||||
|
POSUB = @POSUB@
|
||||||
|
SED = @SED@
|
||||||
|
SET_MAKE = @SET_MAKE@
|
||||||
|
SHELL = @SHELL@
|
||||||
|
STRIP = @STRIP@
|
||||||
|
USE_NLS = @USE_NLS@
|
||||||
|
VERSION = @VERSION@
|
||||||
|
XGETTEXT = @XGETTEXT@
|
||||||
|
XGETTEXT_015 = @XGETTEXT_015@
|
||||||
|
XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
|
XSLTPROC = @XSLTPROC@
|
||||||
|
abs_builddir = @abs_builddir@
|
||||||
|
abs_srcdir = @abs_srcdir@
|
||||||
|
abs_top_builddir = @abs_top_builddir@
|
||||||
|
abs_top_srcdir = @abs_top_srcdir@
|
||||||
|
ac_ct_CC = @ac_ct_CC@
|
||||||
|
am__include = @am__include@
|
||||||
|
am__leading_dot = @am__leading_dot@
|
||||||
|
am__quote = @am__quote@
|
||||||
|
am__tar = @am__tar@
|
||||||
|
am__untar = @am__untar@
|
||||||
|
bindir = @bindir@
|
||||||
|
build = @build@
|
||||||
|
build_alias = @build_alias@
|
||||||
|
build_cpu = @build_cpu@
|
||||||
|
build_os = @build_os@
|
||||||
|
build_vendor = @build_vendor@
|
||||||
|
builddir = @builddir@
|
||||||
|
datadir = @datadir@
|
||||||
|
datarootdir = @datarootdir@
|
||||||
|
docdir = @docdir@
|
||||||
|
dvidir = @dvidir@
|
||||||
|
exec_prefix = @exec_prefix@
|
||||||
|
host = @host@
|
||||||
|
host_alias = @host_alias@
|
||||||
|
host_cpu = @host_cpu@
|
||||||
|
host_os = @host_os@
|
||||||
|
host_vendor = @host_vendor@
|
||||||
|
htmldir = @htmldir@
|
||||||
|
includedir = @includedir@
|
||||||
|
infodir = @infodir@
|
||||||
|
install_sh = @install_sh@
|
||||||
|
intltool__v_merge_options_ = @intltool__v_merge_options_@
|
||||||
|
intltool__v_merge_options_0 = @intltool__v_merge_options_0@
|
||||||
|
libdir = @libdir@
|
||||||
|
libexecdir = @libexecdir@
|
||||||
|
localedir = @localedir@
|
||||||
|
localstatedir = @localstatedir@
|
||||||
|
mandir = @mandir@
|
||||||
|
mkdir_p = @mkdir_p@
|
||||||
|
oldincludedir = @oldincludedir@
|
||||||
|
pdfdir = @pdfdir@
|
||||||
|
prefix = @prefix@
|
||||||
|
program_transform_name = @program_transform_name@
|
||||||
|
psdir = @psdir@
|
||||||
|
sbindir = @sbindir@
|
||||||
|
sharedstatedir = @sharedstatedir@
|
||||||
|
srcdir = @srcdir@
|
||||||
|
sysconfdir = @sysconfdir@
|
||||||
|
target_alias = @target_alias@
|
||||||
|
top_build_prefix = @top_build_prefix@
|
||||||
|
top_builddir = @top_builddir@
|
||||||
|
top_srcdir = @top_srcdir@
|
||||||
|
xkb_base = @xkb_base@
|
||||||
|
xkb_rules_symlink = @xkb_rules_symlink@
|
||||||
|
symbolsdir = $(xkb_base)/symbols/jolla_vndr
|
||||||
|
dist_symbols_DATA = \
|
||||||
|
sbj
|
||||||
|
|
||||||
|
all: all-am
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
|
@for dep in $?; do \
|
||||||
|
case '$(am__configure_deps)' in \
|
||||||
|
*$$dep*) \
|
||||||
|
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
|
||||||
|
&& { if test -f $@; then exit 0; else break; fi; }; \
|
||||||
|
exit 1;; \
|
||||||
|
esac; \
|
||||||
|
done; \
|
||||||
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/jolla_vndr/Makefile'; \
|
||||||
|
$(am__cd) $(top_srcdir) && \
|
||||||
|
$(AUTOMAKE) --foreign symbols/jolla_vndr/Makefile
|
||||||
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
|
@case '$?' in \
|
||||||
|
*config.status*) \
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
|
||||||
|
*) \
|
||||||
|
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
|
||||||
|
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
|
||||||
|
esac;
|
||||||
|
|
||||||
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
|
||||||
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
$(am__aclocal_m4_deps):
|
||||||
|
install-dist_symbolsDATA: $(dist_symbols_DATA)
|
||||||
|
@$(NORMAL_INSTALL)
|
||||||
|
@list='$(dist_symbols_DATA)'; test -n "$(symbolsdir)" || list=; \
|
||||||
|
if test -n "$$list"; then \
|
||||||
|
echo " $(MKDIR_P) '$(DESTDIR)$(symbolsdir)'"; \
|
||||||
|
$(MKDIR_P) "$(DESTDIR)$(symbolsdir)" || exit 1; \
|
||||||
|
fi; \
|
||||||
|
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)$(symbolsdir)'"; \
|
||||||
|
$(INSTALL_DATA) $$files "$(DESTDIR)$(symbolsdir)" || exit $$?; \
|
||||||
|
done
|
||||||
|
|
||||||
|
uninstall-dist_symbolsDATA:
|
||||||
|
@$(NORMAL_UNINSTALL)
|
||||||
|
@list='$(dist_symbols_DATA)'; test -n "$(symbolsdir)" || list=; \
|
||||||
|
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
|
||||||
|
dir='$(DESTDIR)$(symbolsdir)'; $(am__uninstall_files_from_dir)
|
||||||
|
tags TAGS:
|
||||||
|
|
||||||
|
ctags CTAGS:
|
||||||
|
|
||||||
|
cscope cscopelist:
|
||||||
|
|
||||||
|
|
||||||
|
distdir: $(DISTFILES)
|
||||||
|
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
|
||||||
|
list='$(DISTFILES)'; \
|
||||||
|
dist_files=`for file in $$list; do echo $$file; done | \
|
||||||
|
sed -e "s|^$$srcdirstrip/||;t" \
|
||||||
|
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
|
||||||
|
case $$dist_files in \
|
||||||
|
*/*) $(MKDIR_P) `echo "$$dist_files" | \
|
||||||
|
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
|
||||||
|
sort -u` ;; \
|
||||||
|
esac; \
|
||||||
|
for file in $$dist_files; do \
|
||||||
|
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
|
||||||
|
if test -d $$d/$$file; then \
|
||||||
|
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
|
||||||
|
if test -d "$(distdir)/$$file"; then \
|
||||||
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
fi; \
|
||||||
|
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
|
||||||
|
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
|
||||||
|
fi; \
|
||||||
|
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
|
||||||
|
else \
|
||||||
|
test -f "$(distdir)/$$file" \
|
||||||
|
|| cp -p $$d/$$file "$(distdir)/$$file" \
|
||||||
|
|| exit 1; \
|
||||||
|
fi; \
|
||||||
|
done
|
||||||
|
check-am: all-am
|
||||||
|
check: check-am
|
||||||
|
all-am: Makefile $(DATA)
|
||||||
|
installdirs:
|
||||||
|
for dir in "$(DESTDIR)$(symbolsdir)"; do \
|
||||||
|
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||||
|
done
|
||||||
|
install: install-am
|
||||||
|
install-exec: install-exec-am
|
||||||
|
install-data: install-data-am
|
||||||
|
uninstall: uninstall-am
|
||||||
|
|
||||||
|
install-am: all-am
|
||||||
|
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
|
||||||
|
|
||||||
|
installcheck: installcheck-am
|
||||||
|
install-strip:
|
||||||
|
if test -z '$(STRIP)'; then \
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
install; \
|
||||||
|
else \
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||||
|
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||||
|
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||||
|
fi
|
||||||
|
mostlyclean-generic:
|
||||||
|
|
||||||
|
clean-generic:
|
||||||
|
|
||||||
|
distclean-generic:
|
||||||
|
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
|
||||||
|
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
|
||||||
|
|
||||||
|
maintainer-clean-generic:
|
||||||
|
@echo "This command is intended for maintainers to use"
|
||||||
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
clean: clean-am
|
||||||
|
|
||||||
|
clean-am: clean-generic mostlyclean-am
|
||||||
|
|
||||||
|
distclean: distclean-am
|
||||||
|
-rm -f Makefile
|
||||||
|
distclean-am: clean-am distclean-generic
|
||||||
|
|
||||||
|
dvi: dvi-am
|
||||||
|
|
||||||
|
dvi-am:
|
||||||
|
|
||||||
|
html: html-am
|
||||||
|
|
||||||
|
html-am:
|
||||||
|
|
||||||
|
info: info-am
|
||||||
|
|
||||||
|
info-am:
|
||||||
|
|
||||||
|
install-data-am: install-dist_symbolsDATA
|
||||||
|
|
||||||
|
install-dvi: install-dvi-am
|
||||||
|
|
||||||
|
install-dvi-am:
|
||||||
|
|
||||||
|
install-exec-am:
|
||||||
|
|
||||||
|
install-html: install-html-am
|
||||||
|
|
||||||
|
install-html-am:
|
||||||
|
|
||||||
|
install-info: install-info-am
|
||||||
|
|
||||||
|
install-info-am:
|
||||||
|
|
||||||
|
install-man:
|
||||||
|
|
||||||
|
install-pdf: install-pdf-am
|
||||||
|
|
||||||
|
install-pdf-am:
|
||||||
|
|
||||||
|
install-ps: install-ps-am
|
||||||
|
|
||||||
|
install-ps-am:
|
||||||
|
|
||||||
|
installcheck-am:
|
||||||
|
|
||||||
|
maintainer-clean: maintainer-clean-am
|
||||||
|
-rm -f Makefile
|
||||||
|
maintainer-clean-am: distclean-am maintainer-clean-generic
|
||||||
|
|
||||||
|
mostlyclean: mostlyclean-am
|
||||||
|
|
||||||
|
mostlyclean-am: mostlyclean-generic
|
||||||
|
|
||||||
|
pdf: pdf-am
|
||||||
|
|
||||||
|
pdf-am:
|
||||||
|
|
||||||
|
ps: ps-am
|
||||||
|
|
||||||
|
ps-am:
|
||||||
|
|
||||||
|
uninstall-am: uninstall-dist_symbolsDATA
|
||||||
|
|
||||||
|
.MAKE: install-am install-strip
|
||||||
|
|
||||||
|
.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
|
||||||
|
ctags-am distclean distclean-generic distdir dvi dvi-am html \
|
||||||
|
html-am info info-am install install-am install-data \
|
||||||
|
install-data-am install-dist_symbolsDATA 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-generic pdf pdf-am ps ps-am tags-am uninstall \
|
||||||
|
uninstall-am uninstall-dist_symbolsDATA
|
||||||
|
|
||||||
|
.PRECIOUS: Makefile
|
||||||
|
|
||||||
|
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
57
dist/xkeyboard-config/symbols/jolla_vndr/sbj
vendored
Normal file
57
dist/xkeyboard-config/symbols/jolla_vndr/sbj
vendored
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// Instructions
|
||||||
|
//
|
||||||
|
// 1. Set basic layout by:
|
||||||
|
// setxkbmap -rules evdev -model jollasbj -layout cz
|
||||||
|
//
|
||||||
|
// 2. Set variant by:
|
||||||
|
// setxkbmap -rules evdev -model jollasbj -layout cz -variant qwerty
|
||||||
|
// In practice this is equivalent to:
|
||||||
|
// setxkbmap -rules evdev -model jollasbj -layout cz_qwerty
|
||||||
|
// However, the latter form isn't portable so always use the -variant option.
|
||||||
|
//
|
||||||
|
// 3. Set multilayout by:
|
||||||
|
// setxkbmap -rules evdev -model jollasbj -layout "us,cz" -variant ",qwerty" -option grp:ctrl_shift_toggle
|
||||||
|
// This sets the basic us layout active. You can switch to qwerty
|
||||||
|
// variant of cz layout by pressing ctrl+shift.
|
||||||
|
//
|
||||||
|
// Pitfalls
|
||||||
|
//
|
||||||
|
// 1. Many to one mappings
|
||||||
|
//
|
||||||
|
// Higher level input method components don't necessarily handle many to
|
||||||
|
// one mappings correctly. They may assume that there exists only a one
|
||||||
|
// to one mapping between a hardware key and a symbol. Therefore you
|
||||||
|
// should take care not to introduce many to one mappings for keys that
|
||||||
|
// are going to be reverse mapped from a symbol to a hardware key.
|
||||||
|
//
|
||||||
|
// Currently at least the modifier keys are affected. Clients may set
|
||||||
|
// states, such as autorepeat, for hardware keys by reverse mapping a
|
||||||
|
// modifier symbol to a hardware key and then setting the state for the
|
||||||
|
// first hardware key that maps to the symbol. The correct way would be
|
||||||
|
// to modify the state of all hardware keys mapping to a given symbol.
|
||||||
|
//
|
||||||
|
// We are nice and keep the mappings one to one for clients that don't
|
||||||
|
// choose to handle many to one mappings.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
default partial alphanumeric_keys
|
||||||
|
xkb_symbols "common" {
|
||||||
|
include "pc(pc105)"
|
||||||
|
include "jolla_vndr/sbj(common-keys)"
|
||||||
|
|
||||||
|
// This section should not be included by any other section. It's
|
||||||
|
// referenced only once by rule file to allow multiple layout
|
||||||
|
// configurations.
|
||||||
|
};
|
||||||
|
|
||||||
|
partial hidden alphanumeric_keys
|
||||||
|
xkb_symbols "common-keys" {
|
||||||
|
|
||||||
|
// These keycodes are beyond the X11 255 limit value so it would
|
||||||
|
// only be valid for the use with SW which supports extended keycodes,
|
||||||
|
// like xkbcommon.
|
||||||
|
|
||||||
|
// generated from the headset, must always be in the map.
|
||||||
|
key <I264> { [ XF86Phone ] };
|
||||||
|
};
|
||||||
76
dist/xkeyboard-config/symbols/tg
vendored
Normal file
76
dist/xkeyboard-config/symbols/tg
vendored
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
default partial alphanumeric_keys
|
||||||
|
xkb_symbols "basic" {
|
||||||
|
|
||||||
|
include "fr(azerty)"
|
||||||
|
|
||||||
|
name[Group1]="French (Togo)";
|
||||||
|
|
||||||
|
// This is based on French AZERTY-Keyboard layout that is mostly used in Togo.
|
||||||
|
// It includes symbols used to write different local languages in Togo.
|
||||||
|
// Created 2015 by Globalbility Togo (www.globalbility.org)
|
||||||
|
// Authors: Issaka Ouro-Wétchiré, Caroline Riefstahl, Mats Blakstad <mats @ globalbility.org>
|
||||||
|
//
|
||||||
|
// LAYOUT OVERVIEW
|
||||||
|
// ____
|
||||||
|
// | 1 3| 1 = Shift, 3 = AltGr + Shift (AltGr is the right side alt key)
|
||||||
|
// | 2 4| 2 = normal, 4 = AltGr
|
||||||
|
// ¯¯¯¯
|
||||||
|
// ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ ____ _______
|
||||||
|
// | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | ° | + | <-- |
|
||||||
|
// | ² | & | é ~| " #| ' {| ( [| - || è `| _ \| ç ^| à @| ) ]| = }| |
|
||||||
|
// ========================================================================
|
||||||
|
// | |<- | A | Z Ʒ| E | R Ɛ| T Ɗ| Y Ƴ| U Ʊ| I Ɩ| O Ɔ| P | ¨ | $ | , |
|
||||||
|
// | ->| | a | z ʒ| e €| r ɛ| t ɗ| y ƴ| u ʊ| i ɩ| o ɔ| p | ^ ̌| £ ¤| <-' |
|
||||||
|
// ===================================================================¬ |
|
||||||
|
// | | Q Ǝ| S | D Ɖ| F Ƒ| G Ɣ| H Ĥ | J | K | L | M Ŋ| % | µ | |
|
||||||
|
// | MAJ | q ǝ| s | d ɖ| f ƒ| g ɣ| h ɦ| j | k | l | m ɲ| ù `| * ́| |
|
||||||
|
// ========================================================================
|
||||||
|
// | ^ | > | W | X | C | V Ʋ| B Ɓ| N Ŋ| ? | . | / | § | | |
|
||||||
|
// | | | < | w | x | c | v ʋ| b ɓ| n ŋ| , | ; | : ¯| ! ~| | |
|
||||||
|
// ========================================================================
|
||||||
|
// | | | | | | | | |
|
||||||
|
// | Ctrl | Super| Alt | Space Nobreakspace | AltGr | Super|Menu | Ctrl |
|
||||||
|
// ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ ¯¯¯¯¯¯¯ ¯¯¯¯¯¯ ¯¯¯¯¯ ¯¯¯¯¯¯
|
||||||
|
// The different local languages in Togo uses all together 16 symbols not found in French language:
|
||||||
|
// Ʒ, ɛ, Ɗ, Ƴ, Ʊ, Ɩ, Ɔ, Ǝ, Ɖ, Ƒ, Ɣ, Ĥ, Ɲ, Ʋ, Ɓ, Ŋ.
|
||||||
|
// Togolese local languages use 9 tone markers:
|
||||||
|
// Acute ( ´ ), Grave ( ` ), Circumflex ( ˆ ), Caron ( ˇ ), Macron ( ¯ ), Tilde ( ~ ), Tilde + Acute ( ̃́ ), Tilde + Grave ( ̃̀ ), Diaeresis ( ¨ )
|
||||||
|
// The vowels can use these tone markers except diaeresis.
|
||||||
|
// 'Y' is not used as a vowel in most local languages, and can only use diaeresis.
|
||||||
|
// Nasal consonants (m, n, ŋ) can only have have accent tones (acute and grave)
|
||||||
|
|
||||||
|
// Modifications of the basic French Azerty layout to add symbols for Togolese local languages
|
||||||
|
|
||||||
|
// Second row
|
||||||
|
key <AD02> { [ z, Z, ezh, EZH ] }; // U0292 = ʒ (small), U01B7 = Ʒ (capital)
|
||||||
|
|
||||||
|
key <AD04> { [ r, R, U025B, U0190 ] }; // U025B = ɛ (small), U0190 = Ɛ (capital)
|
||||||
|
key <AD05> { [ t, T, U0257, U018A ] }; // U0257 = ɗ (small), U018A = Ɗ (capital)
|
||||||
|
key <AD06> { [ y, Y, U01B4, U01B3 ] }; // U01B4 = ƴ (small), U01B3 = Ƴ (capital)
|
||||||
|
key <AD07> { [ u, U, U028A, U01B1 ] }; // U028A = ʊ (small), U01B1 = Ʊ (capital)
|
||||||
|
key <AD08> { [ i, I, U0269, U0196 ] }; // U0269 = ɩ (small), U0196 = Ɩ (capital)
|
||||||
|
key <AD09> { [ o, O, U0254, U0186 ] }; // U0254 = ɔ (small), U0186 = Ɔ (capital)
|
||||||
|
key <AD11> { [ dead_circumflex,dead_diaeresis, dead_caron ] };
|
||||||
|
|
||||||
|
|
||||||
|
// Third row
|
||||||
|
key <AC01> { [ q, Q, U01DD, U018E ] }; // U01DD = ǝ (small), U018E = Ǝ (capital)
|
||||||
|
key <AC03> { [ d, D, U0256, U0189 ] }; // U0256 = ɖ (small), U0189 = Ɖ (capital)
|
||||||
|
key <AC04> { [ f, F, U0192, U0191 ] }; // U0192 = ƒ (small), U0191 = Ƒ (capital)
|
||||||
|
key <AC05> { [ g, G, U0263, U0194 ] }; // U0263 = ɣ (small), U0194 = Ɣ (capital)
|
||||||
|
key <AC06> { [ h, H, U0266, U0124 ] }; // U0266 = ɦ (small), U0124 = Ĥ (capital)
|
||||||
|
key <AC10> { [ m, M, U0272, U019D ] }; // U0272 = ɲ (small), U019D = Ɲ (capital)
|
||||||
|
key <AC11> { [ ugrave, percent, dead_grave ] };
|
||||||
|
key <BKSL> { [ asterisk, mu, dead_acute ] };
|
||||||
|
|
||||||
|
|
||||||
|
// Fourth row
|
||||||
|
key <AB04> { [ v, V, U028B, U01B2 ] }; // U028B = ʋ (small), U01B2 = Ʋ (capital)
|
||||||
|
key <AB05> { [ b, B, U0253, U0181 ] }; // U0253 = ɓ (small), U0181 = Ɓ (capital)
|
||||||
|
key <AB06> { [ n, N, U014B, U014A ] }; // U014B = ŋ (small), U014A = Ŋ (capital)
|
||||||
|
key <AB09> { [ colon, slash, dead_macron ] };
|
||||||
|
key <AB10> { [ exclam, section, dead_tilde ] };
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
};
|
||||||
4
dist/xkeyboard-config/symbols/us
vendored
4
dist/xkeyboard-config/symbols/us
vendored
@ -541,6 +541,7 @@ xkb_symbols "dvorak-classic" {
|
|||||||
// Main features: Numbers are in shift position (like French), symbols have been
|
// Main features: Numbers are in shift position (like French), symbols have been
|
||||||
// placed in locations that give good hand-alternation and finger rolling with
|
// placed in locations that give good hand-alternation and finger rolling with
|
||||||
// symbols that usually follows, accented characters are possible for I18N.
|
// symbols that usually follows, accented characters are possible for I18N.
|
||||||
|
// Patch suggestions should be sent upstream.
|
||||||
partial alphanumeric_keys
|
partial alphanumeric_keys
|
||||||
xkb_symbols "dvp" {
|
xkb_symbols "dvp" {
|
||||||
|
|
||||||
@ -597,7 +598,8 @@ xkb_symbols "dvp" {
|
|||||||
// lower row, left side
|
// lower row, left side
|
||||||
key <AB01> { [ apostrophe, quotedbl, dead_acute ] };
|
key <AB01> { [ apostrophe, quotedbl, dead_acute ] };
|
||||||
|
|
||||||
include "level3(ralt_switch)"
|
// do NOT hardcode this switch; use lv3:ralt_switch option instead!
|
||||||
|
//include "level3(ralt_switch)"
|
||||||
};
|
};
|
||||||
|
|
||||||
// phonetic layout for Russian letters on an US keyboard
|
// phonetic layout for Russian letters on an US keyboard
|
||||||
|
|||||||
242
dist/xkeyboard-config/types/level5
vendored
242
dist/xkeyboard-config/types/level5
vendored
@ -53,127 +53,127 @@ partial default xkb_types "default" {
|
|||||||
level_name[Level8] = "X Shift Alt";
|
level_name[Level8] = "X Shift Alt";
|
||||||
};
|
};
|
||||||
|
|
||||||
// type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
|
type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
|
||||||
// // Level5-Lock is implemented by using NumLock, because a real modifier
|
// Level5-Lock is implemented by using NumLock, because a real modifier
|
||||||
// // is required.
|
// is required.
|
||||||
//
|
|
||||||
// modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
|
modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
|
||||||
//
|
|
||||||
// map[None] = Level1;
|
map[None] = Level1;
|
||||||
// map[Shift] = Level2;
|
map[Shift] = Level2;
|
||||||
// map[LevelThree] = Level3;
|
map[LevelThree] = Level3;
|
||||||
// map[LevelThree+Shift] = Level4;
|
map[LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// map[LevelFive] = Level5;
|
map[LevelFive] = Level5;
|
||||||
// map[LevelFive+Shift] = Level6;
|
map[LevelFive+Shift] = Level6;
|
||||||
// map[LevelFive+LevelThree] = Level7;
|
map[LevelFive+LevelThree] = Level7;
|
||||||
// map[LevelFive+LevelThree+Shift] = Level8;
|
map[LevelFive+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[NumLock] = Level5;
|
map[NumLock] = Level5;
|
||||||
// map[NumLock+Shift] = Level6;
|
map[NumLock+Shift] = Level6;
|
||||||
// map[NumLock+LevelThree] = Level7;
|
map[NumLock+LevelThree] = Level7;
|
||||||
// map[NumLock+LevelThree+Shift] = Level8;
|
map[NumLock+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[NumLock+LevelFive] = Level1;
|
map[NumLock+LevelFive] = Level1;
|
||||||
// map[NumLock+LevelFive+Shift] = Level2;
|
map[NumLock+LevelFive+Shift] = Level2;
|
||||||
// map[NumLock+LevelFive+LevelThree] = Level3;
|
map[NumLock+LevelFive+LevelThree] = Level3;
|
||||||
// map[NumLock+LevelFive+LevelThree+Shift] = Level4;
|
map[NumLock+LevelFive+LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// // Lock has no effect
|
// Lock has no effect
|
||||||
// map[Lock] = Level1;
|
map[Lock] = Level1;
|
||||||
// map[Lock+Shift] = Level2;
|
map[Lock+Shift] = Level2;
|
||||||
// map[Lock+LevelThree] = Level3;
|
map[Lock+LevelThree] = Level3;
|
||||||
// map[Lock+LevelThree+Shift] = Level4;
|
map[Lock+LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// map[Lock+LevelFive] = Level5;
|
map[Lock+LevelFive] = Level5;
|
||||||
// map[Lock+LevelFive+Shift] = Level6;
|
map[Lock+LevelFive+Shift] = Level6;
|
||||||
// map[Lock+LevelFive+LevelThree] = Level7;
|
map[Lock+LevelFive+LevelThree] = Level7;
|
||||||
// map[Lock+LevelFive+LevelThree+Shift] = Level8;
|
map[Lock+LevelFive+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[Lock+NumLock] = Level5;
|
map[Lock+NumLock] = Level5;
|
||||||
// map[Lock+NumLock+Shift] = Level6;
|
map[Lock+NumLock+Shift] = Level6;
|
||||||
// map[Lock+NumLock+LevelThree] = Level7;
|
map[Lock+NumLock+LevelThree] = Level7;
|
||||||
// map[Lock+NumLock+LevelThree+Shift] = Level8;
|
map[Lock+NumLock+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[Lock+NumLock+LevelFive] = Level1;
|
map[Lock+NumLock+LevelFive] = Level1;
|
||||||
// map[Lock+NumLock+LevelFive+Shift] = Level2;
|
map[Lock+NumLock+LevelFive+Shift] = Level2;
|
||||||
// map[Lock+NumLock+LevelFive+LevelThree] = Level3;
|
map[Lock+NumLock+LevelFive+LevelThree] = Level3;
|
||||||
// map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
|
map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// preserve[LevelFive+Shift] = Shift;
|
preserve[LevelFive+Shift] = Shift;
|
||||||
// preserve[NumLock+Shift] = Shift;
|
preserve[NumLock+Shift] = Shift;
|
||||||
// preserve[Lock+LevelFive+Shift] = Shift;
|
preserve[Lock+LevelFive+Shift] = Shift;
|
||||||
// preserve[Lock+NumLock+Shift] = Shift;
|
preserve[Lock+NumLock+Shift] = Shift;
|
||||||
//
|
|
||||||
// level_name[Level1] = "Base";
|
level_name[Level1] = "Base";
|
||||||
// level_name[Level2] = "Shift";
|
level_name[Level2] = "Shift";
|
||||||
// level_name[Level3] = "Alt Base";
|
level_name[Level3] = "Alt Base";
|
||||||
// level_name[Level4] = "Shift Alt";
|
level_name[Level4] = "Shift Alt";
|
||||||
// level_name[Level5] = "X";
|
level_name[Level5] = "X";
|
||||||
// level_name[Level6] = "X Shift";
|
level_name[Level6] = "X Shift";
|
||||||
// level_name[Level7] = "X Alt Base";
|
level_name[Level7] = "X Alt Base";
|
||||||
// level_name[Level8] = "X Shift Alt";
|
level_name[Level8] = "X Shift Alt";
|
||||||
// };
|
};
|
||||||
//
|
|
||||||
// type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
|
type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
|
||||||
// // Level5-Lock is implemented by using NumLock, because a real modifier
|
// Level5-Lock is implemented by using NumLock, because a real modifier
|
||||||
// // is required.
|
// is required.
|
||||||
//
|
|
||||||
// modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
|
modifiers = Shift + Lock + LevelThree + NumLock + LevelFive;
|
||||||
//
|
|
||||||
// map[None] = Level1;
|
map[None] = Level1;
|
||||||
// map[Shift] = Level2;
|
map[Shift] = Level2;
|
||||||
// map[LevelThree] = Level3;
|
map[LevelThree] = Level3;
|
||||||
// map[LevelThree+Shift] = Level4;
|
map[LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// map[LevelFive] = Level5;
|
map[LevelFive] = Level5;
|
||||||
// map[LevelFive+Shift] = Level6;
|
map[LevelFive+Shift] = Level6;
|
||||||
// map[LevelFive+LevelThree] = Level7;
|
map[LevelFive+LevelThree] = Level7;
|
||||||
// map[LevelFive+LevelThree+Shift] = Level8;
|
map[LevelFive+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[NumLock] = Level5;
|
map[NumLock] = Level5;
|
||||||
// map[NumLock+Shift] = Level6;
|
map[NumLock+Shift] = Level6;
|
||||||
// map[NumLock+LevelThree] = Level7;
|
map[NumLock+LevelThree] = Level7;
|
||||||
// map[NumLock+LevelThree+Shift] = Level8;
|
map[NumLock+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[NumLock+LevelFive] = Level1;
|
map[NumLock+LevelFive] = Level1;
|
||||||
// map[NumLock+LevelFive+Shift] = Level2;
|
map[NumLock+LevelFive+Shift] = Level2;
|
||||||
// map[NumLock+LevelFive+LevelThree] = Level3;
|
map[NumLock+LevelFive+LevelThree] = Level3;
|
||||||
// map[NumLock+LevelFive+LevelThree+Shift] = Level4;
|
map[NumLock+LevelFive+LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// // Lock interchanges Level1 and Level2
|
// Lock interchanges Level1 and Level2
|
||||||
// map[Lock] = Level2;
|
map[Lock] = Level2;
|
||||||
// map[Lock+Shift] = Level1;
|
map[Lock+Shift] = Level1;
|
||||||
// map[Lock+LevelThree] = Level3;
|
map[Lock+LevelThree] = Level3;
|
||||||
// map[Lock+LevelThree+Shift] = Level4;
|
map[Lock+LevelThree+Shift] = Level4;
|
||||||
//
|
|
||||||
// map[Lock+LevelFive] = Level5;
|
map[Lock+LevelFive] = Level5;
|
||||||
// map[Lock+LevelFive+Shift] = Level6;
|
map[Lock+LevelFive+Shift] = Level6;
|
||||||
// map[Lock+LevelFive+LevelThree] = Level7;
|
map[Lock+LevelFive+LevelThree] = Level7;
|
||||||
// map[Lock+LevelFive+LevelThree+Shift] = Level8;
|
map[Lock+LevelFive+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[Lock+NumLock] = Level5;
|
map[Lock+NumLock] = Level5;
|
||||||
// map[Lock+NumLock+Shift] = Level6;
|
map[Lock+NumLock+Shift] = Level6;
|
||||||
// map[Lock+NumLock+LevelThree] = Level7;
|
map[Lock+NumLock+LevelThree] = Level7;
|
||||||
// map[Lock+NumLock+LevelThree+Shift] = Level8;
|
map[Lock+NumLock+LevelThree+Shift] = Level8;
|
||||||
//
|
|
||||||
// map[Lock+NumLock+LevelFive] = Level2;
|
map[Lock+NumLock+LevelFive] = Level2;
|
||||||
// map[Lock+NumLock+LevelFive+Shift] = Level1;
|
map[Lock+NumLock+LevelFive+Shift] = Level1;
|
||||||
// map[Lock+NumLock+LevelFive+LevelThree] = Level4;
|
map[Lock+NumLock+LevelFive+LevelThree] = Level4;
|
||||||
// map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
|
map[Lock+NumLock+LevelFive+LevelThree+Shift] = Level3;
|
||||||
//
|
|
||||||
// preserve[LevelFive+Shift] = Shift;
|
preserve[LevelFive+Shift] = Shift;
|
||||||
// preserve[NumLock+Shift] = Shift;
|
preserve[NumLock+Shift] = Shift;
|
||||||
//
|
|
||||||
// level_name[Level1] = "Base";
|
level_name[Level1] = "Base";
|
||||||
// level_name[Level2] = "Shift";
|
level_name[Level2] = "Shift";
|
||||||
// level_name[Level3] = "Alt Base";
|
level_name[Level3] = "Alt Base";
|
||||||
// level_name[Level4] = "Shift Alt";
|
level_name[Level4] = "Shift Alt";
|
||||||
// level_name[Level5] = "X";
|
level_name[Level5] = "X";
|
||||||
// level_name[Level6] = "X Shift";
|
level_name[Level6] = "X Shift";
|
||||||
// level_name[Level7] = "X Alt Base";
|
level_name[Level7] = "X Alt Base";
|
||||||
// level_name[Level8] = "X Shift Alt";
|
level_name[Level8] = "X Shift Alt";
|
||||||
// };
|
};
|
||||||
|
|
||||||
type "EIGHT_LEVEL_SEMIALPHABETIC" {
|
type "EIGHT_LEVEL_SEMIALPHABETIC" {
|
||||||
modifiers = Shift+Lock+LevelThree+LevelFive;
|
modifiers = Shift+Lock+LevelThree+LevelFive;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user