Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel

ulab-next
Jay Sorg 11 years ago
commit 56783ee262

@ -133,6 +133,9 @@ AC_CHECK_HEADER([X11/Xlib.h], [],
AC_CHECK_HEADER([X11/extensions/Xfixes.h], [], AC_CHECK_HEADER([X11/extensions/Xfixes.h], [],
[AC_MSG_ERROR([please install libx11-dev and libxfixes-dev or libXfixes-devel])], [AC_MSG_ERROR([please install libx11-dev and libxfixes-dev or libXfixes-devel])],
[#include <X11/Xlib.h>]) [#include <X11/Xlib.h>])
AC_CHECK_HEADER([X11/extensions/Xrandr.h], [],
[AC_MSG_ERROR([please install libxrandr-dev or libXrandr-devel])],
[#include <X11/Xlib.h>])
libdir="${libdir}/xrdp"; libdir="${libdir}/xrdp";
if test "x${prefix}" = "xNONE" ; then if test "x${prefix}" = "xNONE" ; then
@ -158,8 +161,8 @@ AC_CONFIG_FILES([Makefile
docs/man/Makefile docs/man/Makefile
instfiles/Makefile instfiles/Makefile
instfiles/pam.d/Makefile instfiles/pam.d/Makefile
instfiles/init.d/Makefile instfiles/init.d/Makefile
instfiles/default/Makefile instfiles/default/Makefile
genkeymap/Makefile genkeymap/Makefile
xrdpapi/Makefile xrdpapi/Makefile
xrdpvr/Makefile xrdpvr/Makefile

Loading…
Cancel
Save