Check for freerdp/locale/keyboard.h before using it, default to old freerdp/kbd/layouts.h if missing.
This commit is contained in:
parent
156422c473
commit
8a8924dc7d
@ -53,7 +53,7 @@ AC_CHECK_LIB([freerdp-utils], [xzalloc],, AC_MSG_ERROR("libfreerdp-utils is requ
|
||||
AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],, AC_MSG_ERROR("libfreerdp-codec is required (part of FreeRDP)"))
|
||||
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS([guacamole/client.h guacamole/guacio.h guacamole/protocol.h])
|
||||
AC_CHECK_HEADERS([guacamole/client.h guacamole/guacio.h guacamole/protocol.h freerdp/locale/keyboard.h freerdp/kbd/layouts.h])
|
||||
|
||||
# Checks for library functions.
|
||||
AC_FUNC_MALLOC
|
||||
|
@ -38,7 +38,11 @@
|
||||
#ifndef _GUAC_RDP_RDP_KEYMAP_H
|
||||
#define _GUAC_RDP_RDP_KEYMAP_H
|
||||
|
||||
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
|
||||
#include <freerdp/locale/keyboard.h>
|
||||
#else
|
||||
#include <freerdp/kbd/layouts.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Represents a keysym-to-scancode mapping for RDP, with extra information
|
||||
|
@ -37,7 +37,12 @@
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include <freerdp/input.h>
|
||||
|
||||
#ifdef HAVE_FREERDP_LOCALE_KEYBOARD_H
|
||||
#include <freerdp/locale/keyboard.h>
|
||||
#else
|
||||
#include <freerdp/kbd/layouts.h>
|
||||
#endif
|
||||
|
||||
#include "rdp_keymap.h"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user