diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-14 11:11:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-14 11:11:28 +0200 |
| commit | c0212d660fe99ea5e4a1b897670f7f7c111553c7 (patch) | |
| tree | 12c04842a73bb885640f1e23ef9a3ca654d09c5a /libX11 | |
| parent | f61137c5cf42ded5eeb85eaf007ae11f0811e022 (diff) | |
| parent | b08ba56019b146786e1cde553c036dd0c4fd02e5 (diff) | |
| download | vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.tar.gz vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.tar.bz2 vcxsrv-c0212d660fe99ea5e4a1b897670f7f7c111553c7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libX11/configure.ac b/libX11/configure.ac index 48a0c8ab9..a45f9d956 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -306,7 +306,15 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) # Find keysymdef.h # AC_MSG_CHECKING([keysym definitions]) -KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 +AC_ARG_WITH([keysymdefdir], + [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], + [KEYSYMDEFDIR=$withval], + [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) + +if test ! -d "$KEYSYMDEFDIR"; then + AC_MSG_ERROR([$KEYSYMDEFDIR doesn't exist or isn't a directory]) +fi + FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h" for i in $FILES; do if test -f "$KEYSYMDEFDIR/$i"; then |