diff options
| author | metalefty <meta@vmeta.jp> | 2020-03-11 09:45:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 09:45:00 +0300 |
| commit | b559a7b31eb695abbb1cc88cf990f15d76103513 (patch) | |
| tree | 0b754a76d7d3a69df176433bf4ea85d1cb90eec4 | |
| parent | abcfcde2d51767c6ebf758096ef5b38ac71ec4c5 (diff) | |
| parent | 33733e0a657e823cc3f5a1bce2a893e95b163e67 (diff) | |
Merge pull request #160 from metalefty/requirementsv0.2.13
Requirements
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | xrdpmouse/Makefile.am | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 143f368..9fc1bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -28,10 +28,8 @@ if test "x${enable_glamor}" = "xyes"; then fi if test "x$XRDP_CFLAGS" = "x"; then - # FIXME: to be changed before releasing 0.2.12 because - # FIXME: some constants such as WM_BUTTON{8,9}{DOWN,UP} are added after 0.9.12 release - # PKG_CHECK_MODULES([XRDP], [xrdp >= 0.9.13]) - PKG_CHECK_MODULES([XRDP], [xrdp >= 0.9.0]) + PKG_CHECK_MODULES([XRDP], [xrdp >= 0.9.13]) + XRDP_CFLAGS=`pkg-config xrdp --cflags` fi AC_ARG_ENABLE([strict-locations], diff --git a/xrdpmouse/Makefile.am b/xrdpmouse/Makefile.am index 580e43a..b58e975 100644 --- a/xrdpmouse/Makefile.am +++ b/xrdpmouse/Makefile.am @@ -1,8 +1,8 @@ EXTRA_DIST = AM_CFLAGS = \ - $(XORG_SERVER_CFLAGS) \ $(XRDP_CFLAGS) \ + $(XORG_SERVER_CFLAGS) \ -DPACKAGE_VERSION_MAJOR=@package_version_major@ \ -DPACKAGE_VERSION_MINOR=@package_version_minor@ \ -DPACKAGE_VERSION_PATCHLEVEL=@package_version_patchlevel@ \ |