mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make configure show it's looking for "pixman", not "xrdp_pixman"

Browse Source 
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.
This commit is contained in:
Pavel Roskin 2016-12-04 12:01:35 -08:00
parent 42d370fcdd
commit c759a1a645
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -201,7 +201,7 @@ then
[AC_MSG_ERROR([please install libmp3lame-dev or lamemp3-devel])]) [AC_MSG_ERROR([please install libmp3lame-dev or lamemp3-devel])])
fi 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 # checking for TurboJPEG
if test "x$enable_tjpeg" = "xyes" if test "x$enable_tjpeg" = "xyes"

4
xrdp/Makefile.am
View File

@ -24,8 +24,8 @@ endif
if XRDP_PIXMAN if XRDP_PIXMAN
AM_CPPFLAGS += -DXRDP_PIXMAN AM_CPPFLAGS += -DXRDP_PIXMAN
AM_CPPFLAGS += $(XRDP_PIXMAN_CFLAGS) AM_CPPFLAGS += $(PIXMAN_CFLAGS)
XRDP_EXTRA_LIBS += $(XRDP_PIXMAN_LIBS) XRDP_EXTRA_LIBS += $(PIXMAN_LIBS)
endif endif
sbin_PROGRAMS = \ sbin_PROGRAMS = \