diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-12-04 12:01:35 -0800 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-12-04 19:38:45 -0800 |
| commit | c759a1a645086be7360c9c835bbecf780001ee20 (patch) | |
| tree | 6edd12cf4ed0a625873b073d97938eb1dd716cb4 | |
| parent | 42d370fcddcbf131618b2a9b741203952a3242db (diff) | |
| download | xrdp-proprietary-c759a1a645086be7360c9c835bbecf780001ee20.tar.gz xrdp-proprietary-c759a1a645086be7360c9c835bbecf780001ee20.zip | |
Make configure show it's looking for "pixman", not "xrdp_pixman"
The pixman library in not part of xrdp. If users see that "xrdp_pixman"
is not found, they might assume it is some xrdp specific library.
The Automake conditional is still XRDP_PIXMAN, but the pkg-config
variables become PIXMAN_LIBS and PIXMAN_CFLAGS.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | xrdp/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3b58f2de..6bb354bf 100644 --- a/configure.ac +++ b/configure.ac @@ -201,7 +201,7 @@ then [AC_MSG_ERROR([please install libmp3lame-dev or lamemp3-devel])]) fi -AS_IF( [test "x$enable_pixman" = "xyes"] , [PKG_CHECK_MODULES(XRDP_PIXMAN, pixman-1 >= 0.1.0)] ) +AS_IF( [test "x$enable_pixman" = "xyes"] , [PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.1.0)] ) # checking for TurboJPEG if test "x$enable_tjpeg" = "xyes" diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am index e24f22e2..400a4285 100644 --- a/xrdp/Makefile.am +++ b/xrdp/Makefile.am @@ -24,8 +24,8 @@ endif if XRDP_PIXMAN AM_CPPFLAGS += -DXRDP_PIXMAN -AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS) -XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS) +AM_CPPFLAGS += $(PIXMAN_CFLAGS) +XRDP_EXTRA_LIBS += $(PIXMAN_LIBS) endif sbin_PROGRAMS = \ |